Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Search also for _jid when importing room from prosody (#2723)

This commit is contained in:
Badlop 2018-12-19 12:10:07 +01:00
parent 0b151f5902
commit 590bb0e64a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/prosody2ejabberd.erl
View File

@ -189,7 +189,11 @@ convert_data(Host, "vcard", User, [Data]) ->
ok
end;
convert_data(_Host, "config", _User, [Data]) ->
RoomJID = jid:decode(proplists:get_value(<<"jid">>, Data, <<"">>)),
RoomJID1 = case proplists:get_value(<<"jid">>, Data, not_found) of
not_found -> proplists:get_value(<<"_jid">>, Data, room_jid_not_found);
A when is_binary(A) -> A
end,
RoomJID = jid:decode(RoomJID1),
Config = proplists:get_value(<<"_data">>, Data, []),
RoomCfg = convert_room_config(Data),
case proplists:get_bool(<<"persistent">>, Config) of