Enable errcheck linter (#646)

2 files changed, 22 insertions, 17 deletions

diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index f9b4dd75..225e16e9 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -195,16 +195,16 @@ func (b *Bslack) Send(msg config.Message) (string, error) {
 
 	// Use webhook to send the message
 	if b.GetString(outgoingWebhookConfig) != "" {
-		return b.sendWebhook(msg)
+		return "", b.sendWebhook(msg)
 	}
 	return b.sendRTM(msg)
 }
 
 // sendWebhook uses the configured WebhookURL to send the message
-func (b *Bslack) sendWebhook(msg config.Message) (string, error) {
+func (b *Bslack) sendWebhook(msg config.Message) error {
 	// Skip events.
 	if msg.Event != "" {
-		return "", nil
+		return nil
 	}
 
 	if b.GetBool(useNickPrefixConfig) {
@@ -259,9 +259,9 @@ func (b *Bslack) sendWebhook(msg config.Message) (string, error) {
 	}
 	if err := b.mh.Send(matterMessage); err != nil {
 		b.Log.Errorf("Failed to send message via webhook: %#v", err)
-		return "", err
+		return err
 	}
-	return "", nil
+	return nil
 }
 
 func (b *Bslack) sendRTM(msg config.Message) (string, error) {
@@ -317,7 +317,7 @@ func (b *Bslack) sendRTM(msg config.Message) (string, error) {
 	return b.postMessage(&msg, channelInfo)
 }
 
-func (b *Bslack) updateTopicOrPurpose(msg *config.Message, channelInfo *slack.Channel) (bool, error) {
+func (b *Bslack) updateTopicOrPurpose(msg *config.Message, channelInfo *slack.Channel) error {
 	var updateFunc func(channelID string, value string) (*slack.Channel, error)
 
 	incomingChangeType, text := b.extractTopicOrPurpose(msg.Text)
@@ -328,15 +328,15 @@ func (b *Bslack) updateTopicOrPurpose(msg *config.Message, channelInfo *slack.Ch
 		updateFunc = b.rtm.SetPurposeOfConversation
 	default:
 		b.Log.Errorf("Unhandled type received from extractTopicOrPurpose: %s", incomingChangeType)
-		return true, nil
+		return nil
 	}
 	for {
 		_, err := updateFunc(channelInfo.ID, text)
 		if err == nil {
-			return true, nil
+			return nil
 		}
 		if err = b.handleRateLimit(err); err != nil {
-			return true, err
+			return err
 		}
 	}
 }
@@ -348,7 +348,7 @@ func (b *Bslack) handleTopicOrPurpose(msg *config.Message, channelInfo *slack.Ch
 	}
 
 	if b.GetBool("SyncTopic") {
-		return b.updateTopicOrPurpose(msg, channelInfo)
+		return true, b.updateTopicOrPurpose(msg, channelInfo)
 	}
 
 	// Pass along to normal message handlers.
diff --git a/bridge/sshchat/sshchat.go b/bridge/sshchat/sshchat.go
index 827c81de..555759bf 100644
--- a/bridge/sshchat/sshchat.go
+++ b/bridge/sshchat/sshchat.go
@@ -30,9 +30,10 @@ func (b *Bsshchat) Connect() error {
 			b.r = bufio.NewScanner(r)
 			b.w = w
 			b.r.Scan()
-			w.Write([]byte("/theme mono\r\n"))
-			b.handleSSHChat()
-			return nil
+			if _, handleErr := w.Write([]byte("/theme mono\r\n")); handleErr != nil {
+				return handleErr
+			}
+			return b.handleSSHChat()
 		})
 	}()
 	if err != nil {
@@ -59,7 +60,9 @@ func (b *Bsshchat) Send(msg config.Message) (string, error) {
 	b.Log.Debugf("=> Receiving %#v", msg)
 	if msg.Extra != nil {
 		for _, rmsg := range helper.HandleExtra(&msg, b.General) {
-			b.w.Write([]byte(rmsg.Username + rmsg.Text + "\r\n"))
+			if _, err := b.w.Write([]byte(rmsg.Username + rmsg.Text + "\r\n")); err != nil {
+				b.Log.Errorf("Could not send extra message: %#v", err)
+			}
 		}
 		if len(msg.Extra["file"]) > 0 {
 			for _, f := range msg.Extra["file"] {
@@ -73,13 +76,15 @@ func (b *Bsshchat) Send(msg config.Message) (string, error) {
 						msg.Text = fi.Comment + ": " + fi.URL
 					}
 				}
-				b.w.Write([]byte(msg.Username + msg.Text))
+				if _, err := b.w.Write([]byte(msg.Username + msg.Text)); err != nil {
+					b.Log.Errorf("Could not send file message: %#v", err)
+				}
 			}
 			return "", nil
 		}
 	}
-	b.w.Write([]byte(msg.Username + msg.Text + "\r\n"))
-	return "", nil
+	_, err := b.w.Write([]byte(msg.Username + msg.Text + "\r\n"))
+	return "", err
 }
 
 /*