From 575864c917dbbe6b58d3e4534c3015327f2cb088 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 5 Sep 2017 12:39:07 -0400 Subject: PLT-7474 Stopped requiring confirmation for mentions in code blocks (#7375) * PLT-7474 Stopped requiring confirmation for mentions in code blocks * Stopped mentioning people from code blocks using ~~~ --- app/notification.go | 4 ++-- app/notification_test.go | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/notification.go b/app/notification.go index b0a5d83ad..c86e1669f 100644 --- a/app/notification.go +++ b/app/notification.go @@ -839,14 +839,14 @@ func GetExplicitMentions(message string, keywords map[string][]string) (map[stri // Matches a line containing only ``` and a potential language definition, any number of lines not containing ```, // and then either a line containing only ``` or the end of the text -var codeBlockPattern = regexp.MustCompile("(?m)^[^\\S\n]*\\`\\`\\`.*$[\\s\\S]+?(^[^\\S\n]*\\`\\`\\`$|\\z)") +var codeBlockPattern = regexp.MustCompile("(?m)^[^\\S\n]*[\\`~]{3}.*$[\\s\\S]+?(^[^\\S\n]*[`~]{3}$|\\z)") // Matches a backquote, either some text or any number of non-empty lines, and then a final backquote var inlineCodePattern = regexp.MustCompile("(?m)\\`+(?:.+?|.*?\n(.*?\\S.*?\n)*.*?)\\`+") // Strips pre-formatted text and code blocks from a Markdown string by replacing them with whitespace func removeCodeFromMessage(message string) string { - if strings.Contains(message, "```") { + if strings.Contains(message, "```") || strings.Contains(message, "~~~") { message = codeBlockPattern.ReplaceAllString(message, "") } diff --git a/app/notification_test.go b/app/notification_test.go index 02b6e1db0..e0c1a54e6 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -399,6 +399,12 @@ func TestRemoveCodeFromMessage(t *testing.T) { if actual := removeCodeFromMessage(input); actual != expected { t.Fatalf("received incorrect output\n\nGot:\n%v\n\nExpected:\n%v\n", actual, expected) } + + input = "this is text with\n~~~\na code block\n~~~\nin it" + expected = "this is text with\n\nin it" + if actual := removeCodeFromMessage(input); actual != expected { + t.Fatalf("received incorrect output\n\nGot:\n%v\n\nExpected:\n%v\n", actual, expected) + } } func TestGetMentionKeywords(t *testing.T) { -- cgit v1.2.3-1-g7c22