From 6dee988b76852c6b15ef59061896ce48ce6ba978 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Fri, 14 Jul 2017 00:35:01 +0200
Subject: Fix megacheck / go vet issues

---
 gateway/gateway.go | 52 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

(limited to 'gateway')

diff --git a/gateway/gateway.go b/gateway/gateway.go
index 03d6aa92..fa1e6348 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -96,31 +96,28 @@ func (gw *Gateway) Start() error {
 }
 
 func (gw *Gateway) handleReceive() {
-	for {
-		select {
-		case msg := <-gw.Message:
-			if msg.Event == config.EVENT_FAILURE {
-				for _, br := range gw.Bridges {
-					if msg.Account == br.Account {
-						go gw.reconnectBridge(br)
-					}
+	for msg := range gw.Message {
+		if msg.Event == config.EVENT_FAILURE {
+			for _, br := range gw.Bridges {
+				if msg.Account == br.Account {
+					go gw.reconnectBridge(br)
 				}
 			}
-			if msg.Event == config.EVENT_REJOIN_CHANNELS {
-				for _, br := range gw.Bridges {
-					if msg.Account == br.Account {
-						br.Joined = make(map[string]bool)
-						br.JoinChannels()
-					}
+		}
+		if msg.Event == config.EVENT_REJOIN_CHANNELS {
+			for _, br := range gw.Bridges {
+				if msg.Account == br.Account {
+					br.Joined = make(map[string]bool)
+					br.JoinChannels()
 				}
-				continue
 			}
-			if !gw.ignoreMessage(&msg) {
-				msg.Timestamp = time.Now()
-				gw.modifyMessage(&msg)
-				for _, br := range gw.Bridges {
-					gw.handleMessage(msg, br)
-				}
+			continue
+		}
+		if !gw.ignoreMessage(&msg) {
+			msg.Timestamp = time.Now()
+			gw.modifyMessage(&msg)
+			for _, br := range gw.Bridges {
+				gw.handleMessage(msg, br)
 			}
 		}
 	}
@@ -317,8 +314,8 @@ func (gw *Gateway) validGatewayDest(msg *config.Message, channel *config.Channel
 
 	// check if we are running a samechannelgateway.
 	// if it is and the channel name matches it's ok, otherwise we shouldn't use this channel.
-	for k, _ := range GIDmap {
-		if channel.SameChannel[k] == true {
+	for k := range GIDmap {
+		if channel.SameChannel[k] {
 			if msg.Channel == channel.Name {
 				// add the gateway to our message
 				msg.Gateway = k
@@ -329,8 +326,8 @@ func (gw *Gateway) validGatewayDest(msg *config.Message, channel *config.Channel
 		}
 	}
 	// check if we are in the correct gateway
-	for k, _ := range GIDmap {
-		if channel.GID[k] == true {
+	for k := range GIDmap {
+		if channel.GID[k] {
 			// add the gateway to our message
 			msg.Gateway = k
 			return true
@@ -340,8 +337,5 @@ func (gw *Gateway) validGatewayDest(msg *config.Message, channel *config.Channel
 }
 
 func isApi(account string) bool {
-	if strings.HasPrefix(account, "api.") {
-		return true
-	}
-	return false
+	return strings.HasPrefix(account, "api.")
 }
-- 
cgit v1.2.3