Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Feb 9, 2023

  • ⚠️ This backport had conflicts and is incomplete

backport of #8722

Self-joined users are just temporary participants and they need to be
removed when they leave a conversation. However, this needs to be done
once they have no more sessions in that conversation; otherwise the
remaining sessions would be kicked out from the conversation as soon as
one leaves it.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
If the external signaling server is used, when a participant is
disinvited it is expected that the client leaves the conversation if
still in it. Therefore, self-joined users should not be disinvited when
they disconnect from a conversation, as they can still have other
sessions in it.

To ensure that self-joined users will be disinvited when their last
session leaves the conversation now a USER_REMOVE event is explicitly
triggered when that last session leaves and the user is, in fact,
removed from the conversation.

Note that this does not cause the system message about the participant
leaving to be sent, as it is explicitly guarded against self-joined
users leaving the conversation. However, this change will cause other
handlers to be called now, like those to invalidate resources, but it is
very likely that they should have been called and that this change is
actually a fix too in that regard.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
This should not make any difference in the behaviour, but it looks more
correct to first disconnect and then remove than the other way around.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu danxuliu force-pushed the backport/8722/stable24 branch from 9e34f53 to c900c6a Compare February 10, 2023 04:44
Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@vitormattos I have integrated your backport fixes in the original commits. Thanks!

@danxuliu danxuliu enabled auto-merge February 10, 2023 04:47
@danxuliu danxuliu merged commit 84ae2b5 into stable24 Feb 10, 2023
@danxuliu danxuliu deleted the backport/8722/stable24 branch February 10, 2023 05:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants