fix: mentioning federated user in card comment

Signed-off-by: Luka Trovic <luka@nextcloud.com>

Author: luka-nextcloud

lib/Service/CommentService.php

@@ -177,7 +177,7 @@ private function formatComment(IComment $comment, bool $addReplyTo = false): arr
 				} catch (OutOfBoundsException $e) {
 					$this->logger->warning('Mention type not registered, can not resolve display name.', ['exception' => $e, 'mention_type' => $mention['type']]);
 					// No display name, upon client's discretion what to display.
-					$displayName = '';
+					$displayName = $mention['id'] ?? '';
 				}
 
 				return [

src/components/card/CommentForm.vue

@@ -58,11 +58,11 @@ export default {
 		members() {
 			const obj = {}
 			this.currentBoard.users.forEach(user => {
-				obj[user.uid] = {
+				obj[user.remote ? `federated_user/${user.uid}` : user.uid] = {
 					icon: 'icon-user',
-					id: user.uid,
-					label: user.displayname,
-					source: 'users',
+					id: user.remote ? `federated_user/${user.uid}` : user.uid,
+					label: user.remote ? user.uid : user.displayname,
+					source: user.remote ? 'federated_user' : 'users',
 				}
 			})
 			return obj

src/components/card/CommentItem.vue

@@ -152,9 +152,9 @@ export default {
 				comment.mentions.forEach((mention, index) => {
 					// Currently only [a-z\-_0-9] are allowed inside of placeholders so we use a hash of the mention id as a unique identifier
 					const hash = md5(mention.mentionId)
+					message = message.replace('federated_user/', '')
 					message = message.split('@' + mention.mentionId + '').join(`{user-${hash}}`)
 					message = message.split('@"' + mention.mentionId + '"').join(`{user-${hash}}`)
-
 				})
 				return message
 			}
@@ -167,7 +167,7 @@ export default {
 					result[itemKey] = {
 						component: AtMention,
 						props: {
-							user: item.mentionId,
+							user: (item.mentionType === 'federated_user' ? 'federated_user/' : '') + item.mentionId,
 							displayName: item.mentionDisplayName,
 						},
 					}