Skip to content

Do not process ANY messages from other Telegram Chats ≠ the bridged Chat ID #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oliveratgithub wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not process ANY messages from other Telegram Chats ≠ the bridged Chat ID #449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions internal/handlers/telegram/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ which handler to fire off
*/
func updateHandler(tg *Client, updates tgbotapi.UpdatesChannel) {
for u := range updates {
// Don't process any messages that didn't come from the
// chat we're bridging
if u.Message.Chat.ID != tg.Settings.ChatID {
tg.logger.LogDebug("Ignored message from a telegram chat we're not bridging:", tg.Settings.ChatID)
continue
}

switch {
case u.Message == nil:
tg.logger.LogError("Missing message data")
Expand Down Expand Up @@ -66,12 +73,6 @@ func messageHandler(tg *Client, u tgbotapi.Update) {
return
}

// Don't forward messages to IRC that didn't come from the
// chat we're bridging
if u.Message.Chat.ID != tg.Settings.ChatID {
return
}

// Telegram user replied to a message
if u.Message.ReplyToMessage != nil {
replyHandler(tg, u)
Expand Down