commit 86aeb5c436fc277a10837b9a24863c9d22bf1d84
Author: Wim <wim@42.be>
Date: Sun Apr 29 22:31:11 2018 +0000
Handle channel posts correctly (telegram)
diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index 93ccb2f..c958aba 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -1217 +1217 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
for update := range updates {
b.Log.Debugf("== Receiving event: %#v", update.Message)
- if update.Message == nil && update.ChannelPost == nil {
+ if update.Message == nil && update.ChannelPost == nil && update.EditedMessage == nil && update.EditedChannelPost == nil {
b.Log.Error("Getting nil messages, this shouldn't happen.")
continue
}
@@ -1336 +1337 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
// handle channels
if update.ChannelPost != nil {
message = update.ChannelPost
+ rmsg.Text = message.Text
}
// edited channel message
@@ -1446 +1457 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
// handle groups
if update.Message != nil {
message = update.Message
+ rmsg.Text = message.Text
}
// edited group message
@@ -1687 +1706 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
rmsg.Username = message.From.FirstName
}
}
- rmsg.Text += message.Text
// only download avatars if we have a place to upload them (configured mediaserver)
if b.General.MediaServerUpload != "" {
b.handleDownloadAvatar(message.From.ID, rmsg.Channel)
