summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim <wim@42.be>2018-11-08 22:29:34 +0100
committerWim <wim@42.be>2018-11-08 22:29:34 +0100
commit78401214b0b5d26fd3f0d10139061edce35e56c1 (patch)
tree21965e91716e118180e9d928ebabb08a8d90daef
parentb2a07aba3a4343087bdbaa2bb5ef7d703bca79e1 (diff)
downloadmatterbridge-msglm-78401214b0b5d26fd3f0d10139061edce35e56c1.tar.gz
matterbridge-msglm-78401214b0b5d26fd3f0d10139061edce35e56c1.tar.bz2
matterbridge-msglm-78401214b0b5d26fd3f0d10139061edce35e56c1.zip
Make scopelint happy
-rw-r--r--bridge/mattermost/mattermost.go1
-rw-r--r--bridge/rocketchat/rocketchat.go1
-rw-r--r--bridge/slack/handlers.go1
-rw-r--r--bridge/slack/slack.go1
-rw-r--r--gateway/gateway.go1
-rw-r--r--gateway/router.go1
6 files changed, 6 insertions, 0 deletions
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 5e04923e..55a4e853 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -389,6 +389,7 @@ 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 c3afa46e..9062c1b9 100644
--- a/bridge/rocketchat/rocketchat.go
+++ b/bridge/rocketchat/rocketchat.go
@@ -49,6 +49,7 @@ 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 e3a10bcd..61f572fa 100644
--- a/bridge/slack/handlers.go
+++ b/bridge/slack/handlers.go
@@ -229,6 +229,7 @@ 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 814aeeac..fd8e3791 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -219,6 +219,7 @@ 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 34cdd7fe..73072fae 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -128,6 +128,7 @@ 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 3a45de36..1ea3f940 100644
--- a/gateway/router.go
+++ b/gateway/router.go
@@ -70,6 +70,7 @@ 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 {