Skip to content
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

Get call peers by federated users #12962

Merged
merged 4 commits into from
Aug 15, 2024
Merged

Get call peers by federated users #12962

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea54c03
fix: Update ping when federated users join the room in the host
danxuliu Aug 14, 2024
6202e05
fix: Get call peers from federated servers
danxuliu Aug 14, 2024
02cfb4e
fix: Take federated users into account when falling back to peer data
danxuliu Aug 14, 2024
75147aa
fix(docs): Add required capability for federation support
nickvergessen Aug 15, 2024
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
Next Next commit
fix: Update ping when federated users join the room in the host 
This is consistent with the behaviour for the rest of participants, as
the ping is updated when a participant joins the room, and it will be
needed for proper behaviour of integration tests that require an updated
ping.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu @nickvergessen
danxuliu authored and nickvergessen committed Aug 15, 2024
commit ea54c032a0da328a809a18c50409f72c756e2a28
5 changes: 5 additions & 0 deletions lib/Controller/RoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1672,6 +1672,11 @@ public function joinFederatedRoom(string $token, ?string $sessionId): DataRespon
$participant = $this->participantService->joinRoomAsFederatedUser($room, Attendee::ACTOR_FEDERATED_USERS, $this->federationAuthenticator->getCloudId(), $sessionId);
}

$session = $participant->getSession();
if ($session instanceof Session) {
$this->sessionService->updateLastPing($session, $this->timeFactory->getTime());
}

// Let the clients know if they need to reload capabilities
$capabilities = $this->capabilities->getCapabilities();
return new DataResponse([], Http::STATUS_OK, [
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/features/federation/join-leave.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ Feature: federation/join-leave
And user "participant1" sees the following attendees in room "room" with 200 (v4)
| actorType | actorId | participantType | sessionIds |
| users | participant1 | 1 | [SESSION,] |
| federated_users | participant2@{$REMOTE_URL} | 3 | [SESSION#participant2@{$REMOTE_URL},] |
| federated_users | participant2@{$REMOTE_URL} | 3 | [SESSION#participant2@{$REMOTE_URL},SESSION#participant2@{$REMOTE_URL},] |
And using server "REMOTE"
And user "participant2" is participant of room "LOCAL::room" (v4)
And user "participant2" sees the following attendees in room "LOCAL::room" with 200 (v4)
| actorType | actorId | participantType | sessionIds |
| federated_users | participant1@{$LOCAL_URL} | 1 | [SESSION,] |
| users | participant2 | 3 | [SESSION#participant2@{$REMOTE_URL},] |
| users | participant2 | 3 | [SESSION#participant2@{$REMOTE_URL},SESSION#participant2@{$REMOTE_URL},] |

Scenario: leave a group room
Given user "participant1" creates room "room" (v4)
Expand Down