-
Notifications
You must be signed in to change notification settings - Fork 449
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.
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
↕️ Split participants into 👤 Attendees and ⏳ Sessions #4324
Conversation
e0e03f0
to
fb5cf2d
Compare
88d1d4b
to
de0333f
Compare
4dcf6a1
to
8d45ec8
Compare
ff70a0d
to
c0e63ef
Compare
1d92a6c
to
0428f53
Compare
@@ -469,24 +555,53 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant): a | |||
$lobbyTimer = 0; | |||
} | |||
|
|||
if ($isSIPBridgeRequest) { | |||
return array_merge($roomData, [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also add information on the participant (for the case information is returned based on the PIN):
- the userid if it's a known user
participantType
If you want to match web- and phone users that are invited by email, e.g. for muting web audio if dialed in by phone, something unique should be returned that is shared for both connections. You could for example use an internal user id like invited:<email>
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to match web- and phone users that are invited by email,
let's focus on email invited guests for now and we figure out the logged in users once this works.
Please also add information on the participant (for the case information is returned based on the PIN):
Opss, yeah since its a sip request we skip that, not intended on the pin verification
d39bcc2
to
ca4e4c9
Compare
f5e3298
to
a0e9068
Compare
The last commit (201b9aa) disables the SIP UI parts temporarily. The split of participants into session + attendee should be complete mostly. We could therefor risk a merge into master and then I continue in a new PR before there is too much happening |
2d35a6e
to
201b9aa
Compare
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
…future so email pins remain) Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
…guests table in Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
201b9aa
to
13d5596
Compare
Rebased after #4489 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some minor comments already.
I'm only halfway through, will continue soon
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added minor comments for the second half
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
/backport to stable20 |
The old participant (table) has been split into 2 sub components:
Attendee (always there):
users
,emails
,guests
(future:groups
andcircles
to track them to automatically add/remove users)Session (optional, currently still limited to 1 per attendee):
The most important thing is that users are no longer identified by
userId || sessionId
, as they might not have a session and not be a logged in user. the new identifier is actor type+idAlso I started to get rid of the queries and modifying functions in the room object. Attendee and Session are "ordinary"
OCP\AppFramework\Db\Entity
objects and I hope the Room will be too at some point. This entries are modified internally via the respectiveOCP\AppFramework\Db\QBMapper
, but access to those should only be done via the ParticipantService (only exception being the Manager which needs to be able to useQBMapper::mapRowToEntity
to create the objects and I don't want to expose this function on the service.Fix #2020