Removed the logic of processing post attachments on receiving update …

…activity from MS Teams (#318) * [MI-3514] Removed the logic of processing post attachments on receiving update activity from MS Teams * [MI-3521] Fixed the issue of emojis showing as html from Teams to MM Modified the msgToPost function to add <p> tag if missing from message Fixed the failing unit test of converters file Modified the order of checking duplicate post in the handleCreatedActivity function * [MI-3521] Fixed the failing unit tests * [MI-3514] Fixed the failing unit tests by fixing a bug
mattermost · Sep 21, 2023 · e1ed876 · e1ed876
1 parent 8c7e66b
commit e1ed876
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/server/handlers/attachments.go b/server/handlers/attachments.go
@@ -91,7 +91,7 @@ func (ah *ActivityHandler) ProcessAndUploadFileToMM(attachmentData []byte, attac
 	return fileInfo.Id, false
 }
 
-func (ah *ActivityHandler) handleAttachments(channelID, userID, text string, msg *msteams.Message, chat *msteams.Chat) (string, model.StringArray, string, bool) {
+func (ah *ActivityHandler) handleAttachments(channelID, userID, text string, msg *msteams.Message, chat *msteams.Chat, isUpdatedActivity bool) (string, model.StringArray, string, bool) {
 	attachments := []string{}
 	newText := text
 	parentID := ""
@@ -130,6 +130,10 @@ func (ah *ActivityHandler) handleAttachments(channelID, userID, text string, msg
 			continue
 		}
 
+		if isUpdatedActivity {
+			continue
+		}
+
 		// handle the download
 		var attachmentData []byte
 		var err error

diff --git a/server/handlers/attachments_test.go b/server/handlers/attachments_test.go
@@ -439,7 +439,7 @@ func TestHandleAttachments(t *testing.T) {
 				ChannelID:   testutils.GetChannelID(),
 			}
 
-			newText, attachmentIDs, parentID, errorsFound := ah.handleAttachments(testutils.GetChannelID(), testutils.GetUserID(), "mock-text", attachments, nil)
+			newText, attachmentIDs, parentID, errorsFound := ah.handleAttachments(testutils.GetChannelID(), testutils.GetUserID(), "mock-text", attachments, nil, false)
 			assert.Equal(t, testCase.expectedParentID, parentID)
 			assert.Equal(t, testCase.expectedAttachmentIDsCount, len(attachmentIDs))
 			assert.Equal(t, testCase.expectedText, newText)

diff --git a/server/handlers/converters.go b/server/handlers/converters.go
@@ -32,7 +32,7 @@ func (ah *ActivityHandler) GetAvatarURL(userID string) string {
 	return defaultAvatarURL
 }
 
-func (ah *ActivityHandler) msgToPost(channelID, senderID string, msg *msteams.Message, chat *msteams.Chat) (*model.Post, bool) {
+func (ah *ActivityHandler) msgToPost(channelID, senderID string, msg *msteams.Message, chat *msteams.Chat, isUpdatedActivity bool) (*model.Post, bool) {
 	text := ah.handleMentions(msg)
 	text = ah.handleEmojis(text)
 	var embeddedImages []msteams.Attachment
@@ -52,7 +52,7 @@ func (ah *ActivityHandler) msgToPost(channelID, senderID string, msg *msteams.Me
 		}
 	}
 
-	newText, attachments, parentID, errorFound := ah.handleAttachments(channelID, senderID, text, msg, chat)
+	newText, attachments, parentID, errorFound := ah.handleAttachments(channelID, senderID, text, msg, chat, isUpdatedActivity)
 	text = newText
 	if parentID != "" {
 		rootID = parentID
@@ -62,7 +62,10 @@ func (ah *ActivityHandler) msgToPost(channelID, senderID string, msg *msteams.Me
 		text = "## " + msg.Subject + "\n" + text
 	}
 
-	post := &model.Post{UserId: senderID, ChannelId: channelID, Message: text, Props: props, RootId: rootID, FileIds: attachments}
+	post := &model.Post{UserId: senderID, ChannelId: channelID, Message: text, Props: props, RootId: rootID}
+	if !isUpdatedActivity {
+		post.FileIds = attachments
+	}
 	post.AddProp("msteams_sync_"+ah.plugin.GetBotUserID(), true)
 
 	if senderID == ah.plugin.GetBotUserID() {

diff --git a/server/handlers/converters_test.go b/server/handlers/converters_test.go
@@ -75,7 +75,7 @@ func TestMsgToPost(t *testing.T) {
 
 			ah.plugin = p
 
-			post, _ := ah.msgToPost(testCase.channelID, testCase.senderID, testCase.message, nil)
+			post, _ := ah.msgToPost(testCase.channelID, testCase.senderID, testCase.message, nil, false)
 			assert.Equal(t, testCase.post, post)
 		})
 	}

diff --git a/server/handlers/handlers.go b/server/handlers/handlers.go
@@ -241,7 +241,7 @@ func (ah *ActivityHandler) handleCreatedActivity(activityIds msteams.ActivityIds
 		return
 	}
 
-	post, errorFound := ah.msgToPost(channelID, senderID, msg, chat)
+	post, errorFound := ah.msgToPost(channelID, senderID, msg, chat, false)
 	ah.plugin.GetAPI().LogDebug("Post generated")
 
 	newPost, appErr := ah.plugin.GetAPI().CreatePost(post)
@@ -343,7 +343,7 @@ func (ah *ActivityHandler) handleUpdatedActivity(activityIds msteams.ActivityIds
 		return
 	}
 
-	post, _ := ah.msgToPost(channelID, senderID, msg, chat)
+	post, _ := ah.msgToPost(channelID, senderID, msg, chat, true)
 	post.Id = postInfo.MattermostID
 
 	if _, appErr := ah.plugin.GetAPI().UpdatePost(post); appErr != nil {