GitHub/matterbridge
3
0
Fork 0
mirror of https://github.com/42wim/matterbridge.git synced 2024-12-24 12:12:39 +01:00
Code Issues Projects Releases Wiki Activity

Add usergroup support (slack). Closes #379

Browse Source
This commit is contained in:
Wim 2018-02-28 22:54:47 +01:00
parent 594d2155e3
commit 0bc9c70c66
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bridge/slack/slack.go
View File

@ -16,12 +16,13 @@ import (
) )
type Bslack struct { type Bslack struct {
mh *matterhook.Client mh *matterhook.Client
sc *slack.Client sc *slack.Client
rtm *slack.RTM rtm *slack.RTM
Users []slack.User Users []slack.User
si *slack.Info Usergroups []slack.UserGroup
channels []slack.Channel si *slack.Info
channels []slack.Channel
*config.BridgeConfig *config.BridgeConfig
} }
@ -283,10 +284,12 @@ func (b *Bslack) handleSlackClient(messages chan *config.Message) {
b.Log.Debugf("%#v", ev.Error()) b.Log.Debugf("%#v", ev.Error())
case *slack.ChannelJoinedEvent: case *slack.ChannelJoinedEvent:
b.Users, _ = b.sc.GetUsers() b.Users, _ = b.sc.GetUsers()
b.Usergroups, _ = b.sc.GetUserGroups()
case *slack.ConnectedEvent: case *slack.ConnectedEvent:
b.channels = ev.Info.Channels b.channels = ev.Info.Channels
b.si = ev.Info b.si = ev.Info
b.Users, _ = b.sc.GetUsers() b.Users, _ = b.sc.GetUsers()
b.Usergroups, _ = b.sc.GetUserGroups()
// add private channels // add private channels
groups, _ := b.sc.GetGroups(true) groups, _ := b.sc.GetGroups(true)
for _, g := range groups { for _, g := range groups {
@ -327,12 +330,24 @@ func (b *Bslack) userName(id string) string {
return "" return ""
} }
func (b *Bslack) userGroupName(id string) string {
for _, u := range b.Usergroups {
if u.ID == id {
return u.Name
}
}
return ""
}
// @see https://api.slack.com/docs/message-formatting#linking_to_channels_and_users // @see https://api.slack.com/docs/message-formatting#linking_to_channels_and_users
func (b *Bslack) replaceMention(text string) string { func (b *Bslack) replaceMention(text string) string {
results := regexp.MustCompile(`<@([a-zA-z0-9]+)>`).FindAllStringSubmatch(text, -1) results := regexp.MustCompile(`<@([a-zA-z0-9]+)>`).FindAllStringSubmatch(text, -1)
for _, r := range results { for _, r := range results {
text = strings.Replace(text, "<@"+r[1]+">", "@"+b.userName(r[1]), -1) text = strings.Replace(text, "<@"+r[1]+">", "@"+b.userName(r[1]), -1)
} }
for _, r := range results {
text = strings.Replace(text, "<@"+r[1]+">", "@"+b.userGroupName(r[1]), -1)
}
return text return text
} }