summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2016-11-03 19:26:00 +0000
committerChristopher Speller <crspeller@gmail.com>2016-11-03 15:26:00 -0400
commit4476adf131dfe72f1245a20499203692acd0e196 (patch)
treee21ff8d3b010a6f5026f004b53014859688548b5 /api
parent7d91f179144def7c58cde48a47fc29164930d3a3 (diff)
downloadchat-4476adf131dfe72f1245a20499203692acd0e196.tar.gz
chat-4476adf131dfe72f1245a20499203692acd0e196.tar.bz2
chat-4476adf131dfe72f1245a20499203692acd0e196.zip
Channel link marker changed from ! to ~ (#4433)
Fixes PLT-4570
Diffstat (limited to 'api')
-rw-r--r--api/slackimport.go2
-rw-r--r--api/slackimport_test.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/api/slackimport.go b/api/slackimport.go
index f6ee9fc4c..759514553 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -440,7 +440,7 @@ func SlackConvertChannelMentions(channels []SlackChannel, posts map[string][]Sla
l4g.Warn(utils.T("api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn"), channel.Id, channel.Name)
continue
}
- regexes["!"+channel.Name] = r
+ regexes["~"+channel.Name] = r
}
for channelName, channelPosts := range posts {
diff --git a/api/slackimport_test.go b/api/slackimport_test.go
index 4da1fa54e..81b79b3d1 100644
--- a/api/slackimport_test.go
+++ b/api/slackimport_test.go
@@ -110,10 +110,10 @@ func TestSlackConvertChannelMentions(t *testing.T) {
expectedPosts := map[string][]SlackPost{
"test-channel": {
{
- Text: "Go to !one.",
+ Text: "Go to ~one.",
},
{
- Text: "Try !two for this.",
+ Text: "Try ~two for this.",
},
},
}