Feature: Support group topics in Telgram sender #1022
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumped telebot package from v2.5.0 to v3.2.1. Fixed related issues in /moira/senders/telegram caused by backwards incompatible struct names and method signatures. Relates moira-alert#1009
Also includes major refactoring of senders/telegram/send.go Custom `Chat` struct is now used for storing chat data in db as json object and `sender.talk`, `sender.sendAsMessage`, `sender.sendAsAlbum` functions instead of `telebot.Chat`. Relates moira-alert#1009
Also includes some refactoring to enable mocking `Sender.bot`. Relates moira-alert#1009
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 13, 2024
almostinf
reviewed
May 27, 2024
cmd/cli/telegram_utils.go
Outdated
| iter := d.Client().Scan(d.Context(), 0, telegramUsersKey+"*", 0).Iterator() | ||
| for iter.Next(d.Context()) { | ||
| key := iter.Val() | ||
| if key == telegramLockName { |
There was a problem hiding this comment.
In a recent PR #1027 we changed the key name slightly from moira-telegram-users:moira-bot-host to moira-telegram-users:moira-bot-host:*, so I suggest changing the code like this:
var (
telegramUsersKey = "moira-telegram-users:"
telegramLockName = "moira-telegram-users:moira-bot-host:"
)
if strings.HasPrefix(key, telegramLockName) {
continue
}
almostinf
reviewed
May 27, 2024
cmd/cli/telegram_utils.go
Outdated
| iter := d.Client().Scan(d.Context(), 0, telegramUsersKey+"*", 0).Iterator() | ||
| for iter.Next(d.Context()) { | ||
| key := iter.Val() | ||
| if key == telegramLockName { |
There was a problem hiding this comment.
var (
telegramUsersKey = "moira-telegram-users:"
telegramLockName = "moira-telegram-users:moira-bot-host:"
)
if strings.HasPrefix(key, telegramLockName) {
continue
}
almostinf
changed the base branch from
master
to
feat/support-telegram-group-topics
…t-group-topics-in-telgram-sender
almostinf
merged commit 736382c
into
moira-alert:feat/support-telegram-group-topics
1 of 3 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements support for group topics as Moira Notification Channels in Telegram sender
Closes #1009