Merge remote-tracking branch 'processone/pr/2805'
* processone/pr/2805: only destroy rooms if mam is enabled
This commit is contained in:
commit
1aeb507114
|
@ -840,10 +840,16 @@ decide_room(unused, {_Room_name, _Host, Room_pid}, ServerHost, Last_allowed) ->
|
||||||
end;
|
end;
|
||||||
decide_room(empty, {Room_name, Host, _Room_pid}, ServerHost, _Last_allowed) ->
|
decide_room(empty, {Room_name, Host, _Room_pid}, ServerHost, _Last_allowed) ->
|
||||||
case gen_mod:is_loaded(ServerHost, mod_mam) of
|
case gen_mod:is_loaded(ServerHost, mod_mam) of
|
||||||
true ->
|
true ->
|
||||||
mod_mam:is_empty_for_room(ServerHost, Room_name, Host);
|
Room_options = get_room_options(Room_name, Host),
|
||||||
_ ->
|
case lists:keyfind(<<"mam">>, 1, Room_options) of
|
||||||
false
|
{<<"mam">>, <<"true">>} ->
|
||||||
|
mod_mam:is_empty_for_room(ServerHost, Room_name, Host);
|
||||||
|
_ ->
|
||||||
|
false
|
||||||
|
end;
|
||||||
|
_ ->
|
||||||
|
false
|
||||||
end.
|
end.
|
||||||
|
|
||||||
seconds_to_days(S) ->
|
seconds_to_days(S) ->
|
||||||
|
|
Loading…
Reference in New Issue