Merge pull request #1534 from nextcloud/fix-slower-active-peers-not-i…

…ncluded-in-user-list-returned-by-signaling

Fix slower active users not included in user list returned by signaling

lib/Controller/SignalingController.php

@@ -42,6 +42,10 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class SignalingController extends OCSController {
+
+	/** @var int */
+	private const PULL_MESSAGES_TIMEOUT = 30;
+
 	/** @var Config */
 	private $config;
 	/** @var TalkSession */
@@ -143,7 +147,7 @@ public function pullMessages(string $token): DataResponse {
 		}
 
 		$data = [];
-		$seconds = 30;
+		$seconds = self::PULL_MESSAGES_TIMEOUT;
 
 		try {
 			$sessionId = $this->session->getSessionForRoom($token);
@@ -211,10 +215,11 @@ public function pullMessages(string $token): DataResponse {
 	 */
 	protected function getUsersInRoom(Room $room, int $pingTimestamp): array {
 		$usersInRoom = [];
-		// Get participants active in the last 30 seconds, or since the last
-		// signaling ping of the current user if it was done more than 30
-		// seconds ago.
-		$timestamp = min(time() - 30, $pingTimestamp);
+		// Get participants active in the last 40 seconds (an extra time is used
+		// to include other participants pinging almost at the same time as the
+		// current user), or since the last signaling ping of the current user
+		// if it was done more than 40 seconds ago.
+		$timestamp = min(time() - (self::PULL_MESSAGES_TIMEOUT + 10), $pingTimestamp);
 		// "- 1" is needed because only the participants whose last ping is
 		// greater than the given timestamp are returned.
 		$participants = $room->getParticipants($timestamp - 1);