Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2025-01-01 17:53:00 +01:00
Code Releases Activity

Store room options in create_room_with_opts only if we will start room

Browse Source 
Previously we could overwrite existing room options and then later return
error because room was already started.
This commit is contained in:
Paweł Chmielowski 2020-10-15 16:24:50 +02:00
parent 6bbae4cea2
commit 73dbd34f95
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_muc_admin.erl
View File

@ -640,13 +640,6 @@ create_room_with_opts(Name1, Host1, ServerHost1, CustomRoomOpts) ->
lists:keysort(1, FormattedRoomOpts), lists:keysort(1, FormattedRoomOpts),
lists:keysort(1, DefRoomOpts)), lists:keysort(1, DefRoomOpts)),
%% Store the room on the server, it is not started yet though at this point
case lists:keyfind(persistent, 1, RoomOpts) of
{persistent, true} ->
mod_muc:store_room(ServerHost, Host, Name, RoomOpts);
_ ->
ok
end,
%% Get all remaining mod_muc parameters that might be utilized %% Get all remaining mod_muc parameters that might be utilized
Access = mod_muc_opt:access(ServerHost), Access = mod_muc_opt:access(ServerHost),
@ -661,6 +654,13 @@ create_room_with_opts(Name1, Host1, ServerHost1, CustomRoomOpts) ->
%% If the room does not exist yet in the muc_online_room %% If the room does not exist yet in the muc_online_room
case get_room_pid(Name, Host) of case get_room_pid(Name, Host) of
room_not_found -> room_not_found ->
%% Store the room on the server, it is not started yet though at this point
case lists:keyfind(persistent, 1, RoomOpts) of
{persistent, true} ->
mod_muc:store_room(ServerHost, Host, Name, RoomOpts);
_ ->
ok
end,
%% Start the room %% Start the room
{ok, Pid} = mod_muc_room:start( {ok, Pid} = mod_muc_room:start(
Host, Host,