From fd7ff9393bbb46e5d2aa9dbd19191b35db316470 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 11 Oct 2023 10:58:32 +0200
Subject: [PATCH] fix(federation): Don't highlight federated users as normal
 users or even primary

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../Message/MessagePart/Mention.vue              | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue
index 6fb1b6e426..79e36b0772 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue
@@ -33,6 +33,10 @@
 			:display-name="name"
 			:avatar-image="'icon-user-forced-white'"
 			:primary="isCurrentGuest" />
+		<NcUserBubble v-else-if="isRemoteUser"
+			:display-name="name"
+			:avatar-image="'icon-user-forced-white'"
+			:primary="isCurrentUser" />
 		<NcUserBubble v-else
 			:display-name="name"
 			:user="id"
@@ -69,6 +73,10 @@ export default {
 			type: String,
 			required: true,
 		},
+		server: {
+			type: String,
+			default: '',
+		},
 	},
 
 	computed: {
@@ -81,6 +89,9 @@ export default {
 		isMentionToGuest() {
 			return this.type === 'guest'
 		},
+		isRemoteUser() {
+			return this.type === 'user' && this.server !== ''
+		},
 		isCurrentGuest() {
 			// On mention bubbles the id is actually "guest/ACTOR_ID" for guests
 			// This is to make sure guests can never collide with users,
@@ -91,6 +102,11 @@ export default {
 				&& this.id === ('guest/' + this.$store.getters.getActorId())
 		},
 		isCurrentUser() {
+			if (this.isRemoteUser) {
+				// For now, we don't highlight remote users even if they are the one
+				return false
+			}
+
 			return this.$store.getters.getActorType() === 'users'
 				&& this.id === this.$store.getters.getUserId()
 		},