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

Jump to bottom

feat: adding breakout rooms #1654

Closed
wants to merge 11 commits into from
Closed

feat: adding breakout rooms #1654

wants to merge 11 commits into from

Conversation

wfleischer
Copy link
Contributor

@wfleischer wfleischer commented Jul 10, 2021 •
edited
Loading

This is a dependency of the breakout rooms feature. See this jitsi-meet pull request.

  • It allows participants to receive json messages from the focus user.
  • Before leaving a room it leaves the corresponding lobby. This prevents issues when a moderator returns to the main room still being in the lobby room.
  • Adds a leave function to the Lobby component.
  • Allows a moderator to admit while being in a breakout room.

@jitsi-jenkins
Copy link

Hi, thanks for your contribution!
If you haven't already done so, could you please make sure you sign our CLA (https://jitsi.org/icla for individuals and https://jitsi.org/ccla for corporations)? We would unfortunately be unable to merge your patch unless we have that piece :(.

@wfleischer wfleischer mentioned this pull request Jul 13, 2021
Closed
@wfleischer wfleischer changed the title feat: allow json messages from focus feat: adding breakout rooms Aug 3, 2021
@sapkra sapkra added the feature-request Issue is really a feature request label Aug 13, 2021
saghul
saghul reviewed Aug 19, 2021
View reviewed changes
Copy link
Member

@saghul saghul left a comment

Choose a reason for hiding this comment

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

Left a couple of comments, I like how small this change feels here.

modules/xmpp/ChatRoom.js Show resolved Hide resolved
modules/xmpp/Lobby.js Outdated Show resolved Hide resolved
modules/xmpp/Lobby.js Outdated Show resolved Hide resolved
@wfleischer @saghul
feat: allow json messages from focus
5acab38
@wfleischer @saghul
feat(breakout-rooms): admit from breakout room
71f6af9 
- moderators leave the lobby when leaving the room
- allows admission to the main rom from a breakout room
@wfleischer @saghul
Adjusting domain on createRoom based on room name
075a916
@saghul saghul force-pushed the focus-json-messages branch from 1c13b7e to 3b49026 Compare September 14, 2021 11:18
@saghul saghul force-pushed the focus-json-messages branch from 3b49026 to c4d2755 Compare September 14, 2021 11:21
@saghul
Copy link
Member

saghul commented Sep 14, 2021

Finally back at this. I rebased and force-pushed.

@saghul
fixup: improve dynamic detection of breakout rooms component
40369ad 
- detect it using dicso-info
- store component address
- remove reliance on breakout room naming convention
@saghul
Copy link
Member

saghul commented Oct 14, 2021

Continues on #1753

@saghul saghul closed this Oct 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saghul saghul saghul left review comments

Assignees
No one assigned
Labels
feature-request Issue is really a feature request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wfleischer @jitsi-jenkins @saghul @sapkra