status-im
/
matterbridge
mirror of https://github.com/status-im/matterbridge.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix panic (mattermost). Closes #186

This commit is contained in:
Wim 2017-06-05 21:35:38 +02:00
parent 6a968ab82a
commit 01496cd080
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
matterclient/matterclient.go
View File

@ -288,7 +288,7 @@ func (m *MMClient) parseActionPost(rmsg *Message) {
if m.GetUser(data.UserId) == nil { if m.GetUser(data.UserId) == nil {
m.UpdateUsers() m.UpdateUsers()
} }
rmsg.Username = m.GetUser(data.UserId).Username rmsg.Username = m.GetUserName(data.UserId)
rmsg.Channel = m.GetChannelName(data.ChannelId) rmsg.Channel = m.GetChannelName(data.ChannelId)
rmsg.Type = data.Type rmsg.Type = data.Type
teamid, _ := rmsg.Raw.Data["team_id"].(string) teamid, _ := rmsg.Raw.Data["team_id"].(string)
@ -621,6 +621,14 @@ func (m *MMClient) GetUser(userId string) *model.User {
return m.Users[userId] return m.Users[userId]
} }
func (m *MMClient) GetUserName(userId string) string {
user := m.GetUser(userId)
if user != nil {
return user.Username
}
return ""
}
func (m *MMClient) GetStatus(userId string) string { func (m *MMClient) GetStatus(userId string) string {
res, err := m.Client.GetStatuses() res, err := m.Client.GetStatuses()
if err != nil { if err != nil {