Merge pull request #25 from lumbric/patch-2

Fix regex to allow brackets, fixes #24
mattermost-community · Sep 10, 2018 · 5a6afd9 · 5a6afd9
2 parents 4933505 + 1c6d539
commit 5a6afd9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/server/autolinker.go b/server/autolinker.go
@@ -23,7 +23,7 @@ func NewAutoLinker(link *Link) (*AutoLinker, error) {
 	}
 
 	if !link.DisableNonWordSuffix {
-		link.Pattern = link.Pattern + "(?P<DisableNonWordSuffix>$|\\s|\\.|\\!|\\?|\\,)"
+		link.Pattern = link.Pattern + "(?P<DisableNonWordSuffix>$|\\s|\\.|\\!|\\?|\\,|\\))"
 		link.Template = link.Template + "${DisableNonWordSuffix}"
 	}
 

diff --git a/server/autolinker_test.go b/server/autolinker_test.go
@@ -50,6 +50,22 @@ func TestAutolink(t *testing.T) {
 			"Welcome MM-12345 should link!",
 			"Welcome [MM-12345](https://mattermost.atlassian.net/browse/MM-12345) should link!",
 		},
+		{
+			&Link{
+				Pattern:  "(MM)(-)(?P<jira_id>\\d+)",
+				Template: "[MM-$jira_id](https://mattermost.atlassian.net/browse/MM-$jira_id)",
+			},
+			"Link in brackets should link (see MM-12345)",
+			"Link in brackets should link (see [MM-12345](https://mattermost.atlassian.net/browse/MM-12345))",
+		},
+		{
+			&Link{
+				Pattern:  "(MM)(-)(?P<jira_id>\\d+)",
+				Template: "[MM-$jira_id](https://mattermost.atlassian.net/browse/MM-$jira_id)",
+			},
+			"Link a ticket MM-12345, before a comma",
+			"Link a ticket [MM-12345](https://mattermost.atlassian.net/browse/MM-12345), before a comma",
+		},
 		{
 			&Link{
 				Pattern:  "(MM)(-)(?P<jira_id>\\d+)",