summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2024-03-07 14:29:49 +0100
committerJoas Schilling <coding@schilljs.com>2024-03-07 16:00:55 +0100
commit4c9b0bd7676d340a984bf1207759f24984fadee9 (patch)
tree0875799492b57f98d97fb6950a22ad022271ffab /lib
parent6d94f4200776636bbd5d45a28bf41db87da3abdd (diff)
fix(federation): Correctly convert message on deleting
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Federation/Proxy/TalkV1/Controller/ChatController.php9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/Federation/Proxy/TalkV1/Controller/ChatController.php b/lib/Federation/Proxy/TalkV1/Controller/ChatController.php
index 3076484c4..9a6c0f099 100644
--- a/lib/Federation/Proxy/TalkV1/Controller/ChatController.php
+++ b/lib/Federation/Proxy/TalkV1/Controller/ChatController.php
@@ -331,14 +331,9 @@ class ChatController {
return new DataResponse([], $statusCode);
}
- /** @var ?TalkChatMessageWithParent $data */
+ /** @var TalkChatMessageWithParent $data */
$data = $this->proxy->getOCSData($proxy, [Http::STATUS_OK, Http::STATUS_ACCEPTED]);
- if (!empty($data)) {
- $data = $this->userConverter->convertAttendee($room, $data, 'actorType', 'actorId', 'actorDisplayName');
- $data = $this->userConverter->convertAttendee($room, $data, 'lastEditActorType', 'lastEditActorId', 'lastEditActorDisplayName');
- } else {
- $data = null;
- }
+ $data = $this->userConverter->convertMessage($room, $data);
$headers = [];
if ($proxy->getHeader('X-Chat-Last-Common-Read')) {