fix: autocomplete federated users mentions with mentionIdfix/13778/federation-fixups

- for federated users mentionId contains prefix, which should be passed

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/composables/useChatMentions.ts b/src/composables/useChatMentions.ts
index 37a6394f75..bb184995d1 100644
--- a/src/composables/useChatMentions.ts
+++ b/src/composables/useChatMentions.ts
@@ -52,7 +52,11 @@ function useChatMentionsComposable(token: Ref<string>): ReturnType {
 	 * @param isDarkTheme whether current theme is dark
 	 */
 	function parseMention(possibleMention: ChatMention, token: string, isDarkTheme: boolean): AutocompleteChatMention {
-		const chatMention: AutocompleteChatMention = { ...possibleMention, status: undefined }
+		const chatMention: AutocompleteChatMention = {
+			...possibleMention,
+			id: possibleMention.mentionId ?? possibleMention.id, // mentionId should be the default match since 'federation-v1'
+			status: undefined,
+		}
 
 		// Set icon for candidate mentions that are not for users.
 		if (possibleMention.source === 'calls') {
@@ -85,13 +89,11 @@ function useChatMentionsComposable(token: Ref<string>): ReturnType {
 			}
 		}
 
-		// mentionId should be the default match since 'federation-v1'
-		const id = possibleMention.mentionId ?? possibleMention.id
 		// caching the user id data for each possible mention
 		if (!userDataTokenMap.value[token]) {
 			Vue.set(userDataTokenMap.value, token, {})
 		}
-		Vue.set(userDataTokenMap.value[token], id, chatMention)
+		Vue.set(userDataTokenMap.value[token], chatMention.id, chatMention)
 
 		return chatMention
 	}