uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity

Use DisplayName instead of deprecated username (slack). Closes #276

Browse Source
This commit is contained in:
Wim 2017-11-02 17:11:42 +01:00
parent b2a6777995
commit b530e92834
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bridge/slack/slack.go
View File

@ -7,7 +7,7 @@ import (
"github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/matterhook" "github.com/42wim/matterbridge/matterhook"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/nlopes/slack" "github.com/matterbridge/slack"
"html" "html"
"io" "io"
"net/http" "net/http"
@ -323,6 +323,9 @@ func (b *Bslack) handleSlackClient(mchan chan *MMMessage) {
} }
m.UserID = user.ID m.UserID = user.ID
m.Username = user.Name m.Username = user.Name
if user.Profile.DisplayName != "" {
m.Username = user.Profile.DisplayName
}
} }
m.Channel = channel.Name m.Channel = channel.Name
m.Text = ev.Text m.Text = ev.Text
@ -394,6 +397,9 @@ func (b *Bslack) handleMatterHook(mchan chan *MMMessage) {
func (b *Bslack) userName(id string) string { func (b *Bslack) userName(id string) string {
for _, u := range b.Users { for _, u := range b.Users {
if u.ID == id { if u.ID == id {
if u.Profile.DisplayName != "" {
return u.Profile.DisplayName
}
return u.Name return u.Name
} }
} }