PLT-7824 Added support for mentions with <@userid> and <!here> (#7615) (#7737)

1 files changed, 2 insertions, 23 deletions

diff --git a/model/slack_attachment.go b/model/slack_attachment.go
index fe3958316..197d3f0f9 100644
--- a/model/slack_attachment.go
+++ b/model/slack_attachment.go
@@ -5,7 +5,6 @@ package model
 
 import (
 	"fmt"
-	"strings"
 )
 
 type SlackAttachment struct {
@@ -34,23 +33,7 @@ type SlackAttachmentField struct {
 	Short bool        `json:"short"`
 }
 
-// To mention @channel via a webhook in Slack, the message should contain
-// <!channel>, as explained at the bottom of this article:
-// https://get.slack.help/hc/en-us/articles/202009646-Making-announcements
-func ExpandAnnouncement(text string) string {
-	c1 := "<!channel>"
-	c2 := "@channel"
-	if strings.Contains(text, c1) {
-		return strings.Replace(text, c1, c2, -1)
-	}
-	return text
-}
-
-// Expand announcements in incoming webhooks from Slack. Those announcements
-// can be found in the text attribute, or in the pretext, text, title and value
-// attributes of the attachment structure. The Slack attachment structure is
-// documented here: https://api.slack.com/docs/attachments
-func ProcessSlackAttachments(a []*SlackAttachment) []*SlackAttachment {
+func StringifySlackFieldValue(a []*SlackAttachment) []*SlackAttachment {
 	var nonNilAttachments []*SlackAttachment
 	for _, attachment := range a {
 		if attachment == nil {
@@ -58,10 +41,6 @@ func ProcessSlackAttachments(a []*SlackAttachment) []*SlackAttachment {
 		}
 		nonNilAttachments = append(nonNilAttachments, attachment)
 
-		attachment.Pretext = ExpandAnnouncement(attachment.Pretext)
-		attachment.Text = ExpandAnnouncement(attachment.Text)
-		attachment.Title = ExpandAnnouncement(attachment.Title)
-
 		var nonNilFields []*SlackAttachmentField
 		for _, field := range attachment.Fields {
 			if field == nil {
@@ -71,7 +50,7 @@ func ProcessSlackAttachments(a []*SlackAttachment) []*SlackAttachment {
 
 			if field.Value != nil {
 				// Ensure the value is set to a string if it is set
-				field.Value = ExpandAnnouncement(fmt.Sprintf("%v", field.Value))
+				field.Value = fmt.Sprintf("%v", field.Value)
 			}
 		}
 		attachment.Fields = nonNilFields