diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-03-07 17:51:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 17:51:31 +0100 |
| commit | edcfc8fa1b9bd6929c345e857c8afcff2c7157e1 (patch) | |
| tree | cebd5e77549cf4fed6020bc231eb346c4251264d /lib | |
| parent | c5332761df68f694a4346725b1c1f1dd1150c803 (diff) | |
| parent | 4c9b0bd7676d340a984bf1207759f24984fadee9 (diff) | |
Merge pull request #11739 from nextcloud/bugfix/noid/correctly-translate-parent-on-deleting-a-message
fix(federation): Correctly convert message on deleting
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Federation/Proxy/TalkV1/Controller/ChatController.php | 9 |
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')) { |