Skip to content

feat(email): Recognize guests invited via email #13499

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 14 commits into from
Oct 23, 2024
Merged

feat(email): Recognize guests invited via email #13499

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5e276f5
feat(email): Recognize guests invited via email
nickvergessen Oct 9, 2024
70562c2
fix(email): Use a hash for the actor ID for better GDPR compliance
nickvergessen Oct 15, 2024
6af6d5c
fix(email): Treat email guests like normal guests in some cases
nickvergessen Oct 15, 2024
63adde2
fix(email): Allow mentioning email guests
nickvergessen Oct 17, 2024
3e0d4c0
fix(email): Fix handling of email guests in system messages
nickvergessen Oct 17, 2024
3ba5adf
feat(email): Handle mentioned email guests
nickvergessen Oct 17, 2024
de5200a
feat(emails): Allow banning email guests
nickvergessen Oct 18, 2024
b9c3a2b
fix(emails): Expire the session but not the attendees for email guests
nickvergessen Oct 18, 2024
88e7cfc
fix(calls): Count email guests as guests in the call summary
nickvergessen Oct 18, 2024
b8c76b0
docs(bots): Clarify the random guest actor id
nickvergessen Oct 18, 2024
4cb26cc
fix(emails): Use dedicated key in API response
nickvergessen Oct 18, 2024
4874ab5
fix(emails): Fix integration tests assuming the email is the actorId
nickvergessen Oct 18, 2024
13f8f71
chore(openapi): Recompile openapi
nickvergessen Oct 18, 2024
644c3fa
fix(ban): Allow email guests to bypass bans on their IP
nickvergessen Oct 23, 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
Prev Previous commit
Next Next commit
fix(emails): Expire the session but not the attendees for email guests 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Oct 23, 2024
commit b9c3a2b7defb96cbfe2c4637c95a0199d5ee5704
4 changes: 4 additions & 0 deletions lib/Controller/RoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,7 @@ protected function formatParticipantList(array $participants, bool $includeStatu
if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_GUESTS) {
$cleanGuests = true;
} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS
|| $participant->getAttendee()->getActorType() === Attendee::ACTOR_EMAILS
|| $participant->getAttendee()->getActorType() === Attendee::ACTOR_FEDERATED_USERS) {
$this->participantService->leaveRoomAsSession($this->room, $participant);
}
Expand Down Expand Up @@ -1077,6 +1078,9 @@ protected function formatParticipantList(array $participants, bool $includeStatu
} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_CIRCLES) {
$result['displayName'] = $participant->getAttendee()->getDisplayName();
} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_EMAILS) {
if ($participant->getSession() instanceof Session && $participant->getSession()->getLastPing() <= $maxPingAge) {
$this->participantService->leaveRoomAsSession($this->room, $participant);
}
$result['displayName'] = $participant->getAttendee()->getDisplayName();
if ($this->participant->hasModeratorPermissions()) {
$result['status'] = IUserStatus::OFFLINE;
Expand Down