Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Missed a few calls in previous commits

Browse Source
This commit is contained in:
Alexey Shchepin 2016-03-02 02:00:02 +03:00
parent 9a049442ff
commit 79853ad44f
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mod_roster.erl
View File

@ -645,14 +645,8 @@ get_subscription_lists(_, LUser, LServer, mnesia) ->
_ -> [] _ -> []
end; end;
get_subscription_lists(_, LUser, LServer, odbc) -> get_subscription_lists(_, LUser, LServer, odbc) ->
Username = ejabberd_odbc:escape(LUser), case catch odbc_queries:get_roster(LServer, LUser) of
case catch odbc_queries:get_roster(LServer, Username) of {selected, Items} when is_list(Items) ->
{selected,
[<<"username">>, <<"jid">>, <<"nick">>,
<<"subscription">>, <<"ask">>, <<"askmessage">>,
<<"server">>, <<"subscribe">>, <<"type">>],
Items}
when is_list(Items) ->
lists:map(fun(I) -> raw_to_record(LServer, I) end, Items); lists:map(fun(I) -> raw_to_record(LServer, I) end, Items);
_ -> [] _ -> []
end; end;
@ -1149,14 +1143,8 @@ get_in_pending_subscriptions(Ls, User, Server, odbc) ->
JID = jid:make(User, Server, <<"">>), JID = jid:make(User, Server, <<"">>),
LUser = JID#jid.luser, LUser = JID#jid.luser,
LServer = JID#jid.lserver, LServer = JID#jid.lserver,
Username = ejabberd_odbc:escape(LUser), case catch odbc_queries:get_roster(LServer, LUser) of
case catch odbc_queries:get_roster(LServer, Username) of {selected, Items} when is_list(Items) ->
{selected,
[<<"username">>, <<"jid">>, <<"nick">>,
<<"subscription">>, <<"ask">>, <<"askmessage">>,
<<"server">>, <<"subscribe">>, <<"type">>],
Items}
when is_list(Items) ->
Ls ++ Ls ++
lists:map(fun (R) -> lists:map(fun (R) ->
Message = R#roster.askmessage, Message = R#roster.askmessage,