fix(lobby): Send virtual jid for main room destroy. (#16724)

* fix(lobby): Send virtual jid for main room destroy.

* squash: Update and when manually disable lobby.

Author: damencho

resources/prosody-plugins/mod_muc_lobby_rooms.lua

@@ -48,6 +48,7 @@ local NOTIFY_LOBBY_ACCESS_DENIED = 'LOBBY-ACCESS-DENIED';
 local util = module:require "util";
 local ends_with = util.ends_with;
 local get_room_by_name_and_subdomain = util.get_room_by_name_and_subdomain;
+local internal_room_jid_match_rewrite = util.internal_room_jid_match_rewrite;
 local get_room_from_jid = util.get_room_from_jid;
 local is_healthcheck_room = util.is_healthcheck_room;
 local presence_check_status = util.presence_check_status;
@@ -502,7 +503,7 @@ process_host_module(main_muc_component_config, function(host_module, host)
                 host_module:fire_event('room-metadata-changed', { room = room; });
             end
         elseif room._data.lobbyroom then
-            destroy_lobby_room(room, room.jid, nil);
+            destroy_lobby_room(room, internal_room_jid_match_rewrite(room.jid), nil); --
             module:fire_event('jitsi-lobby-disabled', { room = room; });
             notify_lobby_enabled(room, actor, false);
         end

resources/prosody-plugins/mod_muc_wait_for_host.lua

@@ -12,6 +12,7 @@ local is_admin = util.is_admin;
 local is_healthcheck_room = util.is_healthcheck_room;
 local is_moderated = util.is_moderated;
 local process_host_module = util.process_host_module;
+local internal_room_jid_match_rewrite = util.internal_room_jid_match_rewrite;
 
 local disable_auto_owners = module:get_option_boolean('wait_for_host_disable_auto_owners', false);
 
@@ -78,7 +79,7 @@ module:hook('muc-occupant-pre-join', function (event)
             module:fire_event('room_host_arrived', room.jid, session);
             lobby_host:fire_event('destroy-lobby-room', {
                 room = room,
-                newjid = room.jid,
+                newjid = internal_room_jid_match_rewrite(room.jid),
                 message = 'Host arrived.',
             });
         elseif not room:get_members_only() then