From dcccd434276c0e7e263e7567af63d6afd2712507 Mon Sep 17 00:00:00 2001 From: Wim Date: Fri, 27 Jan 2017 23:59:24 +0100 Subject: Use unknown as username if unsigned channel (telegram) --- bridge/telegram/telegram.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go index e17c7801..38d7fd12 100644 --- a/bridge/telegram/telegram.go +++ b/bridge/telegram/telegram.go @@ -135,9 +135,9 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) { if username == "" { username = update.ChannelPost.From.UserName } - text = update.ChannelPost.Text - channel = strconv.FormatInt(update.ChannelPost.Chat.ID, 10) } + text = update.ChannelPost.Text + channel = strconv.FormatInt(update.ChannelPost.Chat.ID, 10) } // handle groups if update.Message != nil { @@ -146,11 +146,16 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) { if username == "" { username = update.Message.From.UserName } - text = update.Message.Text - channel = strconv.FormatInt(update.Message.Chat.ID, 10) } + text = update.Message.Text + channel = strconv.FormatInt(update.Message.Chat.ID, 10) + } + if username == "" { + username = "unknown" + } + if text != "" { + 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} } - 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} } } -- cgit v1.2.3