uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity

Fix channel and group messages (telegram)

Browse Source
This commit is contained in:
Wim 2017-01-27 23:26:06 +01:00
parent 077d494c7b
commit 678a7ceb4e
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bridge/telegram/telegram.go
View File

@ -124,11 +124,33 @@ func (b *Btelegram) Send(msg config.Message) error {
} }
func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) { func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
username := ""
text := ""
channel := ""
for update := range updates { for update := range updates {
if update.Message == nil { // handle channels
continue if update.ChannelPost != nil {
if update.ChannelPost.From != nil {
username = update.ChannelPost.From.FirstName
if username == "" {
username = update.ChannelPost.From.UserName
} }
flog.Debugf("Sending message from %s on %s to gateway", update.Message.From.UserName, b.Account) text = update.ChannelPost.Text
b.Remote <- config.Message{Username: update.Message.From.UserName, Text: update.Message.Text, Channel: strconv.FormatInt(update.Message.Chat.ID, 10), Account: b.Account} channel = strconv.FormatInt(update.ChannelPost.Chat.ID, 10)
}
}
// 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}
} }
} }