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

Make mod_persistent_lobby play well with breakout rooms #13939

Closed
wants to merge 2 commits into from
Closed

Make mod_persistent_lobby play well with breakout rooms #13939

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8781445
Make mod_persistent_lobby play well with breakout rooms
dnna Oct 11, 2023
ac3d8cb
Use main_room_active instead of short-circuiting the logic
dnna Oct 22, 2023
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
6 changes: 4 additions & 2 deletions resources/prosody-plugins/mod_persistent_lobby.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ run_when_component_loaded(main_muc_component_host, function(host_module, host_na
-- Check if room should be destroyed when someone leaves the main room

local main_room = event.room;
local main_room_active = main_room and (main_room:has_occupant() or main_room._data.breakout_rooms_active);
if is_healthcheck_room(main_room.jid) or not has_persistent_lobby(main_room) then
return;
end
Expand All @@ -117,7 +118,7 @@ run_when_component_loaded(main_muc_component_host, function(host_module, host_na
-- b) lobby does not exist (possible for lobby to be disabled manually by moderator in meeting)
--
-- (main room destroy also triggers lobby room destroy in muc_lobby_rooms)
if not main_room:has_occupant() then
if not main_room_active then
if lobby_room_jid == nil then -- lobby disabled
trigger_room_destroy(main_room);
else -- lobby exists
Expand All @@ -143,14 +144,15 @@ run_when_component_loaded(lobby_muc_component_host, function(host_module, host_n

local lobby_room = event.room;
local main_room = lobby_room.main_room;
local main_room_active = main_room and (main_room:has_occupant() or main_room._data.breakout_rooms_active);

if not main_room or is_healthcheck_room(main_room.jid) or not has_persistent_lobby(main_room) then
return;
end

-- If both lobby room and main room are empty, we destroy main room.
-- (main room destroy also triggers lobby room destroy in muc_lobby_rooms)
if not lobby_room:has_occupant() and main_room and not main_room:has_occupant() then
if not lobby_room:has_occupant() and not main_room_active then
trigger_room_destroy(main_room);
end

Expand Down