fix (#18793)

app/notification_push.go

@@ -175,7 +175,7 @@ func (a *App) getPushNotificationMessage(contentsConfig, postMessage string, exp
 	}
 
 	if contentsConfig == model.FullNotification {
-		if channelType == model.ChannelTypeDirect {
+		if channelType == model.ChannelTypeDirect && replyToThreadType != model.CommentsNotifyCRT {
 			return model.ClearMentionTags(postMessage)
 		}
 		return senderName + ": " + model.ClearMentionTags(postMessage)

app/notification_push_test.go

@@ -677,6 +677,12 @@ func TestGetPushNotificationMessage(t *testing.T) {
 			ChannelType:       model.ChannelTypeDirect,
 			ExpectedMessage:   "this is a message",
 		},
+		"full message, direct message channel, commented on CRT enabled thread": {
+			Message:           "this is a message",
+			replyToThreadType: model.CommentsNotifyCRT,
+			ChannelType:       model.ChannelTypeDirect,
+			ExpectedMessage:   "user: this is a message",
+		},
 		"generic message with channel, public channel, no mention": {
 			Message:                  "this is a message",
 			PushNotificationContents: model.GenericNotification,