Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kim <gary@garykim.dev>2021-05-28 00:22:30 +0300
committerGary Kim <gary@garykim.dev>2021-07-14 20:44:31 +0300
commitc038c7e0f91b42b303643620b6d635ae8214d009 (patch)
tree8bb764dc80bee86b0e6cfa531aa923e454549179 /lib/Controller/ChatController.php
parentb885469c6c4884019b2f6bfd203da4ecedd8f1e0 (diff)
Fix message grouping
Signed-off-by: Gary Kim <gary@garykim.dev>
Diffstat (limited to 'lib/Controller/ChatController.php')
-rw-r--r--lib/Controller/ChatController.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index ba0e5e60f..ce96caf16 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -556,6 +556,9 @@ class ChatController extends AEnvironmentAwareController {
$attendee = $this->participant->getAttendee();
$isOwnMessage = $message->getActorType() === $attendee->getActorType()
&& $message->getActorId() === $attendee->getActorId();
+
+ // Special case for if the message is a bridged message, then the message is the bridge bot's message.
+ $isOwnMessage = $isOwnMessage || ($message->getActorType() === Attendee::ACTOR_BRIDGED && $attendee->getActorId() === MatterbridgeManager::BRIDGE_BOT_USERID);
if (!$isOwnMessage
&& (!$this->participant->hasModeratorPermissions(false)
|| $this->room->getType() === Room::ONE_TO_ONE_CALL)) {