summaryrefslogtreecommitdiffstats
path: root/lib/Service
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2024-02-29 20:47:47 +0100
committerJoas Schilling <coding@schilljs.com>2024-02-29 20:48:34 +0100
commit986a2dabcb20615f7dcc423e024eaaedcb0c7763 (patch)
treefeec6d1b4307d063fcd3031f52bf156710234515 /lib/Service
parentb9416607e3f7cdebffeb83fb8489cd9ed1b275ae (diff)
fix(federation): Convert actor info in lastMessage info for CPM messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/Service')
-rw-r--r--lib/Service/RoomFormatter.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php
index d20aa4531..655ef3b46 100644
--- a/lib/Service/RoomFormatter.php
+++ b/lib/Service/RoomFormatter.php
@@ -28,6 +28,7 @@ namespace OCA\Talk\Service;
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 @@ class RoomFormatter {
protected IManager $userStatusManager,
protected IUserManager $userManager,
protected ProxyCacheMessagesMapper $proxyCacheMessagesMapper,
+ protected UserConverter $userConverter,
protected IL10N $l10n,
protected ?string $userId,
) {
@@ -393,7 +395,7 @@ class RoomFormatter {
$room->getRemoteToken(),
$room->getLastMessageId(),
);
- $roomData['lastMessage'] = $cachedMessage->jsonSerialize();
+ $roomData['lastMessage'] = $this->userConverter->convertAttendee($room, $cachedMessage->jsonSerialize(), 'actorType', 'actorId', 'actorDisplayName');
} catch (DoesNotExistException $e) {
}
}