commit 5e0b7d33876641d63874cd6deed8a83db911989a
Author: Wim <wim@42.be>
Date: Thu Nov 08 22:29:34 2018 +0000
Make scopelint happy
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 5e04923..55a4e85 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -3896 +3897 @@ func (b *Bmattermost) sendWebhook(msg config.Message) (string, error) {
if msg.Extra != nil {
// this sends a message only if we received a config.EVENT_FILE_FAILURE_SIZE
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
+ rmsg := rmsg // scopelint
iconURL := config.GetIconURL(&rmsg, b.GetString("iconurl"))
matterMessage := matterhook.OMessage{IconURL: iconURL, Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text, Props: make(map[string]interface{})}
matterMessage.Props["matterbridge_"+b.uuid] = true
diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go
index c3afa46..9062c1b 100644
--- a/bridge/rocketchat/rocketchat.go
+++ b/bridge/rocketchat/rocketchat.go
@@ -496 +497 @@ func (b *Brocketchat) Send(msg config.Message) (string, error) {
b.Log.Debugf("=> Receiving %#v", msg)
if msg.Extra != nil {
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
+ rmsg := rmsg // scopelint
iconURL := config.GetIconURL(&rmsg, b.GetString("iconurl"))
matterMessage := matterhook.OMessage{IconURL: iconURL, Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text}
b.mh.Send(matterMessage)
diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go
index e3a10bc..61f572f 100644
--- a/bridge/slack/handlers.go
+++ b/bridge/slack/handlers.go
@@ -2296 +2297 @@ func (b *Bslack) handleAttachments(ev *slack.MessageEvent, rmsg *config.Message)
// If we have files attached, download them (in memory) and put a pointer to it in msg.Extra.
for _, f := range ev.Files {
+ f := f
err := b.handleDownloadFile(rmsg, &f)
if err != nil {
b.Log.Errorf("Could not download incoming file: %#v", err)
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 814aeea..fd8e379 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -2196 +2197 @@ func (b *Bslack) sendWebhook(msg config.Message) (string, error) {
if msg.Extra != nil {
// this sends a message only if we received a config.EVENT_FILE_FAILURE_SIZE
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
+ rmsg := rmsg // scopelint
iconURL := config.GetIconURL(&rmsg, b.GetString(iconURLConfig))
matterMessage := matterhook.OMessage{
IconURL: iconURL,
diff --git a/gateway/gateway.go b/gateway/gateway.go
index 34cdd7f..73072fa 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -1286 +1287 @@ func (gw *Gateway) AddConfig(cfg *config.Gateway) error {
gw.MyConfig = cfg
gw.mapChannels()
for _, br := range append(gw.MyConfig.In, append(gw.MyConfig.InOut, gw.MyConfig.Out...)...) {
+ br := br //scopelint
err := gw.AddBridge(&br)
if err != nil {
return err
diff --git a/gateway/router.go b/gateway/router.go
index 3a45de3..1ea3f94 100644
--- a/gateway/router.go
+++ b/gateway/router.go
@@ -706 +707 @@ func (r *Router) getBridge(account string) *bridge.Bridge {
func (r *Router) handleReceive() {
for msg := range r.Message {
+ msg := msg // scopelint
if msg.Event == config.EVENT_FAILURE {
Loop:
for _, gw := range r.Gateways {
