commit d7ecd0ec06b6d6209d629b27829e151067d36ff2
Author: Wim <wim@42.be>
Date: Thu Aug 30 23:04:50 2018 +0000
Fix panic by using matterclient calls in the right place. Related to b2db24aa (mattermost). Closes #491
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index ce77b06..12b5097 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -1859 +1856 @@ func (b *Bmattermost) handleMatter() {
for message := range messages {
message.Avatar = helper.GetAvatar(b.avatarMap, message.UserID, b.General)
message.Account = b.Account
- if nick := b.mc.GetNickName(message.UserID); nick != "" {
- message.Username = nick
- }
message.Text, ok = b.replaceAction(message.Text)
if ok {
message.Event = config.EVENT_USER_ACTION
@@ -2566 +25311 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
}
}
}
+ // Use nickname instead of username if defined
+ if nick := b.mc.GetNickName(rmsg.UserID); nick != "" {
+ rmsg.Username = nick
+ }
+
messages <- rmsg
}
}
