commit 9003c53bb420885d2d415b5baf45c69c1a2db907
Author: Patrick Connolly <patrick.c.connolly@gmail.com>
Date: Fri Nov 03 15:32:28 2017 +0000
Allow slack messages with variables (eg. @here) to be formatted correctly. (slack) (#288)
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index c09d6f9..11a84a1 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -3406 +3407 @@ func (b *Bslack) handleSlackClient(mchan chan *MMMessage) {
}
m.Raw = ev
m.Text = b.replaceMention(m.Text)
+ m.Text = b.replaceVariable(m.Text)
m.Text = b.replaceChannel(m.Text)
// when using webhookURL we can't check if it's our webhook or not for now
if ev.BotID != "" && b.Config.WebhookURL == "" {
@@ -3876 +3887 @@ func (b *Bslack) handleMatterHook(mchan chan *MMMessage) {
m.Username = message.UserName
m.Text = message.Text
m.Text = b.replaceMention(m.Text)
+ m.Text = b.replaceVariable(m.Text)
m.Text = b.replaceChannel(m.Text)
m.Channel = message.ChannelName
if m.Username == "slackbot" {
@@ -4086 +4107 @@ func (b *Bslack) userName(id string) string {
return ""
}
+// @see https://api.slack.com/docs/message-formatting#linking_to_channels_and_users
func (b *Bslack) replaceMention(text string) string {
results := regexp.MustCompile(`<@([a-zA-z0-9]+)>`).FindAllStringSubmatch(text, -1)
for _, r := range results {
@@ -4166 +4197 @@ func (b *Bslack) replaceMention(text string) string {
return text
}
+// @see https://api.slack.com/docs/message-formatting#linking_to_channels_and_users
func (b *Bslack) replaceChannel(text string) string {
results := regexp.MustCompile(`<#[a-zA-Z0-9]+\|(.+?)>`).FindAllStringSubmatch(text, -1)
for _, r := range results {
@@ -4246 +42816 @@ func (b *Bslack) replaceChannel(text string) string {
return text
}
+// @see https://api.slack.com/docs/message-formatting#variables
+func (b *Bslack) replaceVariable(text string) string {
+ results := regexp.MustCompile(`<!([a-zA-Z0-9]+)(\|.+?)?>`).FindAllStringSubmatch(text, -1)
+ for _, r := range results {
+ text = strings.Replace(text, r[0], "@"+r[1], -1)
+ }
+ return text
+}
+
+// @see https://api.slack.com/docs/message-formatting#linking_to_urls
func (b *Bslack) replaceURL(text string) string {
results := regexp.MustCompile(`<(.*?)(\|.*?)?>`).FindAllStringSubmatch(text, -1)
for _, r := range results {
