fix(federation): Fix conversation avatar for @all

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Mar 11, 2024 · ce7029a · ce7029a
1 parent 1050fa7
commit ce7029a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/Federation/Proxy/TalkV1/UserConverter.php b/lib/Federation/Proxy/TalkV1/UserConverter.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\ResponseDefinitions;
 use OCA\Talk\Room;
+use OCA\Talk\Service\AvatarService;
 use OCA\Talk\Service\ParticipantService;
 
 /**
@@ -42,6 +43,7 @@ class UserConverter {
 
 	public function __construct(
 		protected ParticipantService $participantService,
+		protected AvatarService $avatarService,
 	) {
 	}
 
@@ -105,6 +107,9 @@ protected function convertMessageParameter(Room $room, array $parameter): array
 					$parameter['name'] = $localParticipants[$cloudId]['displayName'];
 				}
 			}
+		} elseif ($parameter['type'] === 'call' && $parameter['id'] === $room->getRemoteToken()) {
+			$parameter['id'] = $room->getToken();
+			$parameter['icon-url'] = $this->avatarService->getAvatarUrl($room);
 		}
 		return $parameter;
 	}

diff --git a/lib/Notification/FederationChatNotifier.php b/lib/Notification/FederationChatNotifier.php
@@ -109,7 +109,7 @@ protected function isMentioned(Participant $participant, ProxyCacheMessage $mess
 	protected function isMentionedAll(Room $room, ProxyCacheMessage $message): bool {
 		foreach ($message->getParsedMessageParameters() as $parameter) {
 			if ($parameter['type'] === 'call' // RichObjectDefinition
-				&& $parameter['id'] === $room->getRemoteToken()) {
+				&& $parameter['id'] === $room->getToken()) {
 				return true;
 			}
 		}