diff options
| author | Badlop <badlop@process-one.net> | 2018-12-19 12:10:07 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2018-12-19 12:11:59 +0100 |
| commit | 590bb0e64aadebff813eb25f1708c770879489d8 (patch) | |
| tree | 82b8c6d16f4a3c81db57031b51135626fc249356 /src/prosody2ejabberd.erl | |
| parent | Parse persistent and archiving room options importing from prosody (#2720) (diff) | |
Search also for _jid when importing room from prosody (#2723)
Diffstat (limited to 'src/prosody2ejabberd.erl')
| -rw-r--r-- | src/prosody2ejabberd.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl index 2690eb960..e9b77e8e3 100644 --- a/src/prosody2ejabberd.erl +++ b/src/prosody2ejabberd.erl @@ -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 |