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

Handle persist=false in roster items (#2722)

This commit is contained in:
Badlop 2018-12-21 14:46:54 +01:00
parent e9d537527c
commit 011cf55eb5
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/prosody2ejabberd.erl
View File

@ -307,22 +307,24 @@ convert_roster_item(LUser, LServer, JIDstring, LuaList) ->
InitR = #roster{usj = {LUser, LServer, LJID},
us = {LUser, LServer},
jid = LJID},
Roster =
lists:foldl(
fun({<<"groups">>, Val}, R) ->
lists:foldl(
fun({<<"groups">>, Val}, [R]) ->
Gs = lists:flatmap(
fun({G, true}) -> [G];
(_) -> []
end, Val),
R#roster{groups = Gs};
({<<"subscription">>, Sub}, R) ->
R#roster{subscription = misc:binary_to_atom(Sub)};
({<<"ask">>, <<"subscribe">>}, R) ->
R#roster{ask = out};
({<<"name">>, Name}, R) ->
R#roster{name = Name}
end, InitR, LuaList),
[Roster]
[R#roster{groups = Gs}];
({<<"subscription">>, Sub}, [R]) ->
[R#roster{subscription = misc:binary_to_atom(Sub)}];
({<<"ask">>, <<"subscribe">>}, [R]) ->
[R#roster{ask = out}];
({<<"name">>, Name}, [R]) ->
[R#roster{name = Name}];
({<<"persist">>, false}, _) ->
[];
(_, []) ->
[]
end, [InitR], LuaList)
catch _:{bad_jid, _} ->
[]
end.