From ee4ac67081a4155a2b5852b9c9c2161084adefe0 Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 5 May 2018 23:15:50 +0200 Subject: Fix possible nil when using channels (telegram). #410 --- bridge/telegram/telegram.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bridge/telegram') diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go index c958aba2..a5cba288 100644 --- a/bridge/telegram/telegram.go +++ b/bridge/telegram/telegram.go @@ -229,7 +229,10 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) { if rmsg.Text != "" || len(rmsg.Extra) > 0 { rmsg.Text = helper.RemoveEmptyNewLines(rmsg.Text) - rmsg.Avatar = helper.GetAvatar(b.avatarMap, strconv.Itoa(message.From.ID), b.General) + // channels don't have (always?) user information. see #410 + if message.From != nil { + rmsg.Avatar = helper.GetAvatar(b.avatarMap, strconv.Itoa(message.From.ID), b.General) + } b.Log.Debugf("<= Sending message from %s on %s to gateway", rmsg.Username, b.Account) b.Log.Debugf("<= Message is %#v", rmsg) -- cgit v1.2.3