From b78ce0709a8493d61746b6690b43f07b5f564d3b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 2 Mar 2022 14:20:47 +0100
Subject: Emit a event so the HPB can send the update to the participants

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Signaling/Listener.php | 58 +++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

(limited to 'lib/Signaling')

diff --git a/lib/Signaling/Listener.php b/lib/Signaling/Listener.php
index 2d603e2af..2452729f8 100644
--- a/lib/Signaling/Listener.php
+++ b/lib/Signaling/Listener.php
@@ -27,7 +27,6 @@ use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Config;
 use OCA\Talk\Events\AddParticipantsEvent;
 use OCA\Talk\Events\ChatEvent;
-use OCA\Talk\Events\ChatParticipantEvent;
 use OCA\Talk\Events\EndCallForEveryoneEvent;
 use OCA\Talk\Events\ModifyEveryoneEvent;
 use OCA\Talk\Events\ModifyParticipantEvent;
@@ -36,7 +35,6 @@ use OCA\Talk\Events\RemoveParticipantEvent;
 use OCA\Talk\Events\RemoveUserEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\GuestManager;
-use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -323,39 +321,31 @@ class Listener {
 				$notifier->participantsModified($event->getRoom(), $sessionIds);
 			}
 		});
-		$dispatcher->addListener(ChatManager::EVENT_AFTER_MESSAGE_SEND, static function (ChatParticipantEvent $event) {
-			if (self::isUsingInternalSignaling()) {
-				return;
-			}
 
-			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->get(BackendNotifier::class);
-
-			$room = $event->getRoom();
-			$message = [
-				'type' => 'chat',
-				'chat' => [
-					'refresh' => true,
-				],
-			];
-			$notifier->sendRoomMessage($room, $message);
-		});
-		$dispatcher->addListener(ChatManager::EVENT_AFTER_SYSTEM_MESSAGE_SEND, static function (ChatEvent $event) {
-			if (self::isUsingInternalSignaling()) {
-				return;
-			}
-
-			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->get(BackendNotifier::class);
+		$dispatcher->addListener(ChatManager::EVENT_AFTER_MESSAGE_SEND, [self::class, 'notifyUsersViaExternalSignalingToRefreshTheChat']);
+		$dispatcher->addListener(ChatManager::EVENT_AFTER_SYSTEM_MESSAGE_SEND, [self::class, 'notifyUsersViaExternalSignalingToRefreshTheChat']);
+		$dispatcher->addListener(ChatManager::EVENT_AFTER_MULTIPLE_SYSTEM_MESSAGE_SEND, [self::class, 'notifyUsersViaExternalSignalingToRefreshTheChat']);
+	}
 
-			$room = $event->getRoom();
-			$message = [
-				'type' => 'chat',
-				'chat' => [
-					'refresh' => true,
-				],
-			];
-			$notifier->sendRoomMessage($room, $message);
-		});
+	public static function notifyUsersViaExternalSignalingToRefreshTheChat(ChatEvent $event): void {
+		if (self::isUsingInternalSignaling()) {
+			return;
+		}
+
+		if ($event->shouldSkipLastActivityUpdate()) {
+			return;
+		}
+
+		/** @var BackendNotifier $notifier */
+		$notifier = \OC::$server->get(BackendNotifier::class);
+
+		$room = $event->getRoom();
+		$message = [
+			'type' => 'chat',
+			'chat' => [
+				'refresh' => true,
+			],
+		];
+		$notifier->sendRoomMessage($room, $message);
 	}
 }
-- 
cgit v1.2.3