Send the notifications after joining the call

This prevents issues when sending takes long, e.g. with a lot of users

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 27 insertions, 2 deletions

diff --git a/lib/Notification/Listener.php b/lib/Notification/Listener.php
index cb2a56cf7..9f1a38e29 100644
--- a/lib/Notification/Listener.php
+++ b/lib/Notification/Listener.php
@@ -44,6 +44,9 @@ class Listener {
 	/** @var ILogger */
 	protected $logger;
 
+	/** @var bool */
+	protected $shouldSendCallNotification = false;
+
 	public function __construct(IManager $notificationManager,
 								IUserSession $userSession,
 								ITimeFactory $timeFactory,
@@ -78,13 +81,20 @@ class Listener {
 		$listener = static function(RoomEvent $event) {
 			/** @var self $listener */
 			$listener = \OC::$server->query(self::class);
-			$listener->generateCallNotifications($event->getRoom());
+			$listener->checkCallNotifications($event->getRoom());
 		};
 		$dispatcher->addListener(Room::EVENT_BEFORE_SESSION_JOIN_CALL, $listener);
 
 		$listener = static function(RoomEvent $event) {
 			/** @var self $listener */
 			$listener = \OC::$server->query(self::class);
+			$listener->sendCallNotifications($event->getRoom());
+		};
+		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_JOIN_CALL, $listener);
+
+		$listener = static function(RoomEvent $event) {
+			/** @var self $listener */
+			$listener = \OC::$server->query(self::class);
 			$listener->markCallNotificationsRead($event->getRoom());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_JOIN_CALL, $listener);
@@ -161,13 +171,28 @@ class Listener {
 	 *
 	 * @param Room $room
 	 */
-	public function generateCallNotifications(Room $room): void {
+	public function checkCallNotifications(Room $room): void {
 		if ($room->getActiveSince() instanceof \DateTime) {
 			// Call already active => No new notifications
+			$this->shouldSendCallNotification = false;
 			return;
 		}
 
 		if ($room->getObjectType() === 'file') {
+			$this->shouldSendCallNotification = false;
+			return;
+		}
+
+		$this->shouldSendCallNotification = true;
+	}
+
+	/**
+	 * Call notification: "{user} wants to talk with you"
+	 *
+	 * @param Room $room
+	 */
+	public function sendCallNotifications(Room $room): void {
+		if (!$this->shouldSendCallNotification) {
 			return;
 		}