Skip to content

Base queries on sessions where it makes sense #5258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 3 commits into from
Feb 24, 2021
Merged

Base queries on sessions where it makes sense #5258

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cc02f5
Make the method loop over the sessions instead of the attendees
nickvergessen Feb 24, 2021
a347cf2
Pick all sessions instead of attendees when returning participants on…
nickvergessen Feb 24, 2021
adc5996
First check for session because we don't do something otherwise anyway
nickvergessen Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pick all sessions instead of attendees when returning participants on… 
… signaling

Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Feb 24, 2021
commit a347cf23752aec0f08b95ccdbdee5a44b9f9a0f0
4 changes: 2 additions & 2 deletions lib/Controller/SignalingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,11 @@ protected function getUsersInRoom(Room $room, int $pingTimestamp): array {
$timestamp = min($this->timeFactory->getTime() - (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 = $this->participantService->getParticipantsForRoom($room);
$participants = $this->participantService->getParticipantsForAllSessions($room, $timestamp - 1);
foreach ($participants as $participant) {
$session = $participant->getSession();
if (!$session instanceof Session) {
// User is not active
// This is just to make Psalm happy, since we select by session it's always with one.
continue;
}

Expand Down