From e24f1c7c879beb0703fdd91bf640283685f377d0 Mon Sep 17 00:00:00 2001 From: Wim Date: Fri, 2 Mar 2018 22:30:44 +0100 Subject: [PATCH] Use replaceVariable for usergroups (slack) #379 --- bridge/slack/slack.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index e89954e2..9572548f 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -345,9 +345,6 @@ func (b *Bslack) replaceMention(text string) string { for _, r := range results { 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 } @@ -362,9 +359,13 @@ func (b *Bslack) replaceChannel(text string) string { // @see https://api.slack.com/docs/message-formatting#variables func (b *Bslack) replaceVariable(text string) string { - results := regexp.MustCompile(``).FindAllStringSubmatch(text, -1) + results := regexp.MustCompile(``).FindAllStringSubmatch(text, -1) for _, r := range results { - text = strings.Replace(text, r[0], "@"+r[1], -1) + if r[2] != "" { + text = strings.Replace(text, r[0], "@"+r[2], -1) + } else { + text = strings.Replace(text, r[0], "@"+r[1], -1) + } } return text }