Merge pull request #1599 from nextcloud/backport/1581/duplicated-call…

…-summary-message [stable15] Fix duplicated call summary message when multiple people leave at the…
nextcloud · Mar 7, 2019 · d9848f5 · d9848f5
2 parents d415915 + 1c2a8d8
commit d9848f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lib/Activity/Hooks.php b/lib/Activity/Hooks.php
@@ -85,6 +85,13 @@ public function generateCallActivity(Room $room): bool {
 			return false;
 		}
 
+		$numGuests = $room->getActiveGuests();
+
+		if (!$room->resetActiveSince()) {
+			// Race-condition, the room was already reset.
+			return false;
+		}
+
 		$event = $this->activityManager->generateEvent();
 		try {
 			$event->setApp('spreed')
@@ -95,7 +102,7 @@ public function generateCallActivity(Room $room): bool {
 				->setSubject('call', [
 					'room' => $room->getId(),
 					'users' => $userIds,
-					'guests' => $room->getActiveGuests(),
+					'guests' => $numGuests,
 					'duration' => $duration,
 				]);
 		} catch (\InvalidArgumentException $e) {
@@ -107,7 +114,7 @@ public function generateCallActivity(Room $room): bool {
 			'message' => 'call_ended',
 			'parameters' => [
 				'users' => $userIds,
-				'guests' => $room->getActiveGuests(),
+				'guests' => $numGuests,
 				'duration' => $duration,
 			],
 		]), new \DateTime(), false);
@@ -123,7 +130,6 @@ public function generateCallActivity(Room $room): bool {
 			}
 		}
 
-		$room->resetActiveSince();
 		return true;
 	}
 

diff --git a/lib/Room.php b/lib/Room.php
@@ -422,7 +422,11 @@ public function resetActiveSince() {
 			->set('active_guests', $query->createNamedParameter(0))
 			->set('active_since', $query->createNamedParameter(null, 'datetime'))
 			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
+
+		$this->activeGuests = 0;
+		$this->activeSince = null;
+
+		return (bool) $query->execute();
 	}
 
 	/**