diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-03-01 16:43:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 16:43:14 +0100 |
| commit | f4ce578002aea4d5a93712431e4be1d858315ce7 (patch) | |
| tree | 9d8f5e2d2b38ee45b3b291178a511d9f298a9d07 | |
| parent | 3274d5881bd903ddbd849a15ee321e679e39099c (diff) | |
| parent | cd633a95af01f70c6e91cd8262902787ce93d9da (diff) | |
Merge pull request #11699 from nextcloud/bugfix/noid/allow-leaving-and-replying
fix(federation): Allow leaving and replying
| -rw-r--r-- | lib/Model/Message.php | 7 | ||||
| -rw-r--r-- | lib/Service/RoomFormatter.php | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/Model/Message.php b/lib/Model/Message.php index fe1140347..d279f583d 100644 --- a/lib/Model/Message.php +++ b/lib/Model/Message.php @@ -173,7 +173,12 @@ class Message { $this->getMessageType() !== ChatManager::VERB_MESSAGE_DELETED && $this->getMessageType() !== ChatManager::VERB_REACTION && $this->getMessageType() !== ChatManager::VERB_REACTION_DELETED && - \in_array($this->getActorType(), [Attendee::ACTOR_USERS, Attendee::ACTOR_GUESTS, Attendee::ACTOR_BOTS]); + \in_array($this->getActorType(), [ + Attendee::ACTOR_USERS, + Attendee::ACTOR_FEDERATED_USERS, + Attendee::ACTOR_GUESTS, + Attendee::ACTOR_BOTS, + ], true); } /** diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php index 251e63c75..1cd8d9fb5 100644 --- a/lib/Service/RoomFormatter.php +++ b/lib/Service/RoomFormatter.php @@ -402,6 +402,7 @@ class RoomFormatter { if ($room->getRemoteServer() !== '') { $roomData['attendeeId'] = (int) $attendee->getRemoteId(); + $roomData['canLeaveConversation'] = true; } return $roomData; |