Fixed so only original message with channel wide mentions are IRC NOT…

…ICEs
42wim · Mar 15, 2021 · a75d1b6 · a75d1b6
1 parent 767af48
commit a75d1b6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
@@ -735,6 +735,7 @@ func (m *Mattermost) handleWsActionPost(rmsg *model.WebSocketEvent) {
 		return
 	}
 
+	replyMessage := ""
 	if data.ParentId != "" {
 		parentPost, resp := m.mc.Client.GetPost(data.ParentId, "")
 		if resp.Error != nil {
@@ -744,7 +745,7 @@ func (m *Mattermost) handleWsActionPost(rmsg *model.WebSocketEvent) {
 
 			if !m.v.GetBool("mattermost.hidereplies") {
 				parentMessage := maybeShorten(parentPost.Message, m.v.GetInt("mattermost.ShortenRepliesTo"), "@", m.v.GetBool("mattermost.unicode"))
-				data.Message = fmt.Sprintf("%s (re @%s: %s)", data.Message, parentGhost.Nick, parentMessage)
+				replyMessage = fmt.Sprintf(" (re @%s: %s)", parentGhost.Nick, parentMessage)
 			}
 		}
 	}
@@ -809,7 +810,7 @@ func (m *Mattermost) handleWsActionPost(rmsg *model.WebSocketEvent) {
 		return
 	}
 
-	msgs := strings.Split(data.Message, "\n")
+	msgs := strings.Split(data.Message+replyMessage, "\n")
 
 	channelType := ""
 	if t, ok := props["channel_type"].(string); ok {