From 99ce68e9ba8b6cef5cd8a2da2f57a79c9f286bfc Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Fri, 20 Apr 2018 01:01:45 +0200
Subject: [PATCH] Use username if bot name is Slack API Tester (slack)

---
 bridge/slack/slack.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 7d413337..0abd83c3 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -521,6 +521,19 @@ func (b *Bslack) handleMessageEvent(ev *slack.MessageEvent) (*config.Message, er
 			}
 			rmsg.UserID = bot.ID
 		}
+
+		// fixes issues with matterircd users
+		if bot.Name == "Slack API Tester" {
+			user, err := b.rtm.GetUserInfo(ev.User)
+			if err != nil {
+				return nil, err
+			}
+			rmsg.UserID = user.ID
+			rmsg.Username = user.Name
+			if user.Profile.DisplayName != "" {
+				rmsg.Username = user.Profile.DisplayName
+			}
+		}
 	}
 
 	// file comments are set by the system (because there is no username given)