24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-26 22:35:31 +02:00

mod_disco: Apply minor readability improvements

This commit is contained in:
Holger Weiss 2015-04-26 16:36:17 +02:00
parent 0edba763fb
commit dc449687a0

View File

@ -352,21 +352,19 @@ get_sm_items(empty, From, To, _Node, _Lang) ->
_ -> {error, ?ERR_NOT_ALLOWED} _ -> {error, ?ERR_NOT_ALLOWED}
end. end.
is_presence_subscribed(#jid{luser = User, is_presence_subscribed(#jid{luser = User, lserver = Server},
lserver = Server},
#jid{luser = User, lserver = Server}) -> true; #jid{luser = User, lserver = Server}) -> true;
is_presence_subscribed(#jid{luser = User, is_presence_subscribed(#jid{luser = FromUser, lserver = FromServer},
lserver = Server}, #jid{luser = ToUser, lserver = ToServer}) ->
#jid{luser = LUser, lserver = LServer}) -> lists:any(fun (#roster{jid = {SubUser, SubServer, _}, subscription = Sub})
lists:any(fun (#roster{jid = {TUser, TServer, _}, when FromUser == SubUser, FromServer == SubServer,
subscription = S}) -> Sub /= none ->
if User == TUser, Server == TServer, S /= none -> true;
true; (_RosterEntry) ->
true -> false false
end
end, end,
ejabberd_hooks:run_fold(roster_get, LServer, [], ejabberd_hooks:run_fold(roster_get, ToServer, [],
[{LUser, LServer}])). [{ToUser, ToServer}])).
process_sm_iq_info(From, To, process_sm_iq_info(From, To,
#iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) -> #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) ->