commit 1c08e524fc37176690e623564035de54c5f3736d
Author: Wim <wim@42.be>
Date: Thu Sep 21 23:15:04 2017 +0000
Fix loop, make megacheck happy
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 985d0d7..3274d81 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -18018 +18023 @@ 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
- }
- message = "uploaded a file: " + fi.Name
- if b.Config.PrefixMessagesWithNick {
- message = nick + "uploaded a file: " + fi.Name
+ 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})
}
- return b.mc.PostMessageWithFiles(b.mc.GetChannelId(channel, ""), message, []string{id})
+ return res, err
}
}
if msg.ID != "" {
