From 6dee988b76852c6b15ef59061896ce48ce6ba978 Mon Sep 17 00:00:00 2001 From: Wim Date: Fri, 14 Jul 2017 00:35:01 +0200 Subject: [PATCH] Fix megacheck / go vet issues --- bridge/bridge.go | 5 +--- bridge/config/config.go | 2 +- bridge/irc/helper.go | 2 ++ bridge/irc/irc.go | 4 +-- bridge/mattermost/mattermost.go | 6 ++-- bridge/rocketchat/rocketchat.go | 1 - bridge/slack/slack.go | 2 +- bridge/steam/steam.go | 2 +- gateway/gateway.go | 52 +++++++++++++++------------------ hook/rockethook/rockethook.go | 9 +++--- matterclient/matterclient.go | 11 ++++--- matterhook/matterhook.go | 9 +++--- 12 files changed, 46 insertions(+), 59 deletions(-) diff --git a/bridge/bridge.go b/bridge/bridge.go index 2cf56c0b..8e0fe063 100644 --- a/bridge/bridge.go +++ b/bridge/bridge.go @@ -88,10 +88,7 @@ func New(cfg *config.Config, bridge *config.Bridge, c chan config.Message) *Brid func (b *Bridge) JoinChannels() error { err := b.joinChannels(b.Channels, b.Joined) - if err != nil { - return err - } - return nil + return err } func (b *Bridge) joinChannels(channels map[string]config.ChannelInfo, exists map[string]bool) error { diff --git a/bridge/config/config.go b/bridge/config/config.go index 69a13e43..2bac2e7d 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -209,7 +209,7 @@ func Deprecated(cfg Protocol, account string) bool { log.Printf("ERROR: %s BindAddress is deprecated, you need to change it to WebhookBindAddress.", account) } else if cfg.URL != "" { log.Printf("ERROR: %s URL is deprecated, you need to change it to WebhookURL.", account) - } else if cfg.UseAPI == true { + } else if cfg.UseAPI { log.Printf("ERROR: %s UseAPI is deprecated, it's enabled by default, please remove it from your config file.", account) } else { return false diff --git a/bridge/irc/helper.go b/bridge/irc/helper.go index 355dc552..dd1cc468 100644 --- a/bridge/irc/helper.go +++ b/bridge/irc/helper.go @@ -4,6 +4,7 @@ import ( "strings" ) +/* func tableformatter(nicks []string, nicksPerRow int, continued bool) string { result := "|IRC users" if continued { @@ -29,6 +30,7 @@ func tableformatter(nicks []string, nicksPerRow int, continued bool) string { } return result } +*/ func plainformatter(nicks []string, nicksPerRow int) string { return strings.Join(nicks, ", ") + " currently on IRC" diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go index b86ff508..a5f047d0 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -148,9 +148,9 @@ func (b *Birc) Send(msg config.Message) error { func (b *Birc) doSend() { rate := time.Millisecond * time.Duration(b.Config.MessageDelay) - throttle := time.Tick(rate) + throttle := time.NewTicker(rate) for msg := range b.Local { - <-throttle + <-throttle.C b.i.Privmsg(msg.Channel, msg.Username+msg.Text) } } diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index 222522ee..d4258345 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -12,9 +12,8 @@ type MMhook struct { } type MMapi struct { - mc *matterclient.MMClient - mmMap map[string]string - mmIgnoreNicks []string + mc *matterclient.MMClient + mmMap map[string]string } type MMMessage struct { @@ -29,7 +28,6 @@ type Bmattermost struct { MMapi Config *config.Protocol Remote chan config.Message - name string TeamId string Account string } diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go index 8eb788f9..1b731f94 100644 --- a/bridge/rocketchat/rocketchat.go +++ b/bridge/rocketchat/rocketchat.go @@ -16,7 +16,6 @@ type Brocketchat struct { MMhook Config *config.Protocol Remote chan config.Message - name string Account string } diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index c1e324a9..6555d40b 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -120,7 +120,7 @@ func (b *Bslack) Send(msg config.Message) error { return err } np := slack.NewPostMessageParameters() - if b.Config.PrefixMessagesWithNick == true { + if b.Config.PrefixMessagesWithNick { np.AsUser = true } np.Username = nick diff --git a/bridge/steam/steam.go b/bridge/steam/steam.go index 5f40972f..ad4b1988 100644 --- a/bridge/steam/steam.go +++ b/bridge/steam/steam.go @@ -136,7 +136,7 @@ func (b *Bsteam) handleEvents() { myLoginInfo.AuthCode = code } default: - log.Errorf("LogOnFailedEvent: ", e.Result) + log.Errorf("LogOnFailedEvent: %#v ", e.Result) // TODO: Handle EResult_InvalidLoginAuthCode return } 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.") } diff --git a/hook/rockethook/rockethook.go b/hook/rockethook/rockethook.go index eafd4f43..063be742 100644 --- a/hook/rockethook/rockethook.go +++ b/hook/rockethook/rockethook.go @@ -99,10 +99,9 @@ func (c *Client) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Receive returns an incoming message from mattermost outgoing webhooks URL. func (c *Client) Receive() Message { - for { - select { - case msg := <-c.In: - return msg - } + var msg Message + for msg = range c.In { + return msg } + return msg } diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go index 47fb2113..75d883f3 100644 --- a/matterclient/matterclient.go +++ b/matterclient/matterclient.go @@ -88,7 +88,7 @@ func (m *MMClient) SetLogLevel(level string) { func (m *MMClient) Login() error { // check if this is a first connect or a reconnection firstConnection := true - if m.WsConnected == true { + if m.WsConnected { firstConnection = false } m.WsConnected = false @@ -149,7 +149,7 @@ func (m *MMClient) Login() error { return errors.New("invalid " + model.SESSION_COOKIE_TOKEN) } } else { - myinfo, appErr = m.Client.Login(m.Credentials.Login, m.Credentials.Pass) + _, appErr = m.Client.Login(m.Credentials.Login, m.Credentials.Pass) } if appErr != nil { d := b.Duration() @@ -329,7 +329,6 @@ func (m *MMClient) parseActionPost(rmsg *Message) { } rmsg.Text = data.Message rmsg.Post = data - return } func (m *MMClient) UpdateUsers() error { @@ -535,7 +534,7 @@ func (m *MMClient) UpdateLastViewed(channelId string) { if m.mmVersion() >= 3.08 { view := model.ChannelView{ChannelId: channelId} res, _ := m.Client.ViewChannel(view) - if res == false { + if !res { m.log.Errorf("ChannelView update for %s failed", channelId) } return @@ -683,13 +682,13 @@ func (m *MMClient) GetUsers() map[string]*model.User { func (m *MMClient) GetUser(userId string) *model.User { m.Lock() defer m.Unlock() - u, ok := m.Users[userId] + _, ok := m.Users[userId] if !ok { res, err := m.Client.GetProfilesByIds([]string{userId}) if err != nil { return nil } - u = res.Data.(map[string]*model.User)[userId] + u := res.Data.(map[string]*model.User)[userId] m.Users[userId] = u } return m.Users[userId] diff --git a/matterhook/matterhook.go b/matterhook/matterhook.go index 7d02ef4d..a2690806 100644 --- a/matterhook/matterhook.go +++ b/matterhook/matterhook.go @@ -134,12 +134,11 @@ func (c *Client) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Receive returns an incoming message from mattermost outgoing webhooks URL. func (c *Client) Receive() IMessage { - for { - select { - case msg := <-c.In: - return msg - } + var msg IMessage + for msg := range c.In { + return msg } + return msg } // Send sends a msg to mattermost incoming webhooks URL.