commit 25a78463ee161cf6443ef6902c0b524f99164afb
Author: Wim <wim@42.be>
Date: Fri Jan 27 23:26:06 2017 +0000
Fix channel and group messages (telegram)
diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index b179dd6..cbf8eed 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -12411 +12433 @@ func (b *Btelegram) Send(msg config.Message) error {
}
func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
+ username := ""
+ text := ""
+ channel := ""
for update := range updates {
- if update.Message == nil {
- continue
+ // handle channels
+ if update.ChannelPost != nil {
+ if update.ChannelPost.From != nil {
+ username = update.ChannelPost.From.FirstName
+ if username == "" {
+ username = update.ChannelPost.From.UserName
+ }
+ text = update.ChannelPost.Text
+ channel = strconv.FormatInt(update.ChannelPost.Chat.ID, 10)
+ }
}
- flog.Debugf("Sending message from %s on %s to gateway", update.Message.From.UserName, b.Account)
- b.Remote <- config.Message{Username: update.Message.From.UserName, Text: update.Message.Text, Channel: strconv.FormatInt(update.Message.Chat.ID, 10), Account: b.Account}
+ // handle groups
+ if update.Message != nil {
+ if update.Message.From != nil {
+ username = update.Message.From.FirstName
+ if username == "" {
+ username = update.Message.From.UserName
+ }
+ text = update.Message.Text
+ channel = strconv.FormatInt(update.Message.Chat.ID, 10)
+ }
+ }
+ flog.Debugf("Sending message from %s on %s to gateway", username, b.Account)
+ b.Remote <- config.Message{Username: username, Text: text, Channel: channel, Account: b.Account}
}
}
