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

Use replaceVariable for usergroups (slack) #379

This commit is contained in:
Wim 2018-03-02 22:30:44 +01:00
parent dbf8a326d5
commit e24f1c7c87
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridge/slack/slack.go
View File

@ -345,9 +345,6 @@ func (b *Bslack) replaceMention(text string) string {
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
} }
@ -362,10 +359,14 @@ func (b *Bslack) replaceChannel(text string) string {
// @see https://api.slack.com/docs/message-formatting#variables // @see https://api.slack.com/docs/message-formatting#variables
func (b *Bslack) replaceVariable(text string) string { func (b *Bslack) replaceVariable(text string) string {
results := regexp.MustCompile(`<!([a-zA-Z0-9]+)(\|.+?)?>`).FindAllStringSubmatch(text, -1) results := regexp.MustCompile(`<!((?:subteam\^)?[a-zA-Z0-9]+)(?:\|(.+?))?>`).FindAllStringSubmatch(text, -1)
for _, r := range results { for _, r := range results {
if r[2] != "" {
text = strings.Replace(text, r[0], "@"+r[2], -1)
} else {
text = strings.Replace(text, r[0], "@"+r[1], -1) text = strings.Replace(text, r[0], "@"+r[1], -1)
} }
}
return text return text
} }