From 986a2dabcb20615f7dcc423e024eaaedcb0c7763 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Feb 2024 20:47:47 +0100
Subject: [PATCH] fix(federation): Convert actor info in lastMessage info for
 CPM messages

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Service/RoomFormatter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php
index d20aa45318c..655ef3b46b9 100644
--- a/lib/Service/RoomFormatter.php
+++ b/lib/Service/RoomFormatter.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Chat\MessageParser;
 use OCA\Talk\Config;
+use OCA\Talk\Federation\Proxy\TalkV1\UserConverter;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\BreakoutRoom;
 use OCA\Talk\Model\ProxyCacheMessagesMapper;
@@ -64,6 +65,7 @@ public function __construct(
 		protected IManager $userStatusManager,
 		protected IUserManager $userManager,
 		protected ProxyCacheMessagesMapper $proxyCacheMessagesMapper,
+		protected UserConverter $userConverter,
 		protected IL10N $l10n,
 		protected ?string $userId,
 	) {
@@ -393,7 +395,7 @@ public function formatRoomV4(
 					$room->getRemoteToken(),
 					$room->getLastMessageId(),
 				);
-				$roomData['lastMessage'] = $cachedMessage->jsonSerialize();
+				$roomData['lastMessage'] = $this->userConverter->convertAttendee($room, $cachedMessage->jsonSerialize(), 'actorType', 'actorId', 'actorDisplayName');
 			} catch (DoesNotExistException $e) {
 			}
 		}