From 7aabe12acfb054561b85c95f34169d734a28b1eb Mon Sep 17 00:00:00 2001 From: Wim Date: Thu, 21 Sep 2017 23:15:04 +0200 Subject: [PATCH] Fix loop, make megacheck happy --- bridge/mattermost/mattermost.go | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index 985d0d76..3274d81d 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -180,18 +180,23 @@ func (b *Bmattermost) Send(msg config.Message) (string, error) { return msg.ID, b.mc.DeleteMessage(msg.ID) } if msg.Extra != nil { - for _, f := range msg.Extra["file"] { - fi := f.(config.FileInfo) - id, err := b.mc.UploadFile(*fi.Data, b.mc.GetChannelId(channel, ""), fi.Name) - if err != nil { - flog.Debugf("ERROR %#v", err) - return "", err + if len(msg.Extra["file"]) > 0 { + var err error + var res, id string + for _, f := range msg.Extra["file"] { + fi := f.(config.FileInfo) + id, err = b.mc.UploadFile(*fi.Data, b.mc.GetChannelId(channel, ""), fi.Name) + if err != nil { + flog.Debugf("ERROR %#v", err) + return "", err + } + message = "uploaded a file: " + fi.Name + if b.Config.PrefixMessagesWithNick { + message = nick + "uploaded a file: " + fi.Name + } + res, err = b.mc.PostMessageWithFiles(b.mc.GetChannelId(channel, ""), message, []string{id}) } - message = "uploaded a file: " + fi.Name - if b.Config.PrefixMessagesWithNick { - message = nick + "uploaded a file: " + fi.Name - } - return b.mc.PostMessageWithFiles(b.mc.GetChannelId(channel, ""), message, []string{id}) + return res, err } } if msg.ID != "" {