diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-04-26 16:36:17 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-04-26 16:36:17 +0200 |
| commit | dc449687a01c9e874f3f8f8e8d3d5cd1c8c5f422 (patch) | |
| tree | 5c87183d933faba3e6d7dd4611fad2e7d74f9290 /src/mod_disco.erl | |
| parent | mod_disco: Omit 'roster_get' call if possible (diff) | |
mod_disco: Apply minor readability improvements
Diffstat (limited to '')
| -rw-r--r-- | src/mod_disco.erl | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/mod_disco.erl b/src/mod_disco.erl index 724b9b957..00b65d23e 100644 --- a/src/mod_disco.erl +++ b/src/mod_disco.erl @@ -352,21 +352,19 @@ get_sm_items(empty, From, To, _Node, _Lang) -> _ -> {error, ?ERR_NOT_ALLOWED} end. -is_presence_subscribed(#jid{luser = User, - lserver = Server}, +is_presence_subscribed(#jid{luser = User, lserver = Server}, #jid{luser = User, lserver = Server}) -> true; -is_presence_subscribed(#jid{luser = User, - lserver = Server}, - #jid{luser = LUser, lserver = LServer}) -> - lists:any(fun (#roster{jid = {TUser, TServer, _}, - subscription = S}) -> - if User == TUser, Server == TServer, S /= none -> - true; - true -> false - end +is_presence_subscribed(#jid{luser = FromUser, lserver = FromServer}, + #jid{luser = ToUser, lserver = ToServer}) -> + lists:any(fun (#roster{jid = {SubUser, SubServer, _}, subscription = Sub}) + when FromUser == SubUser, FromServer == SubServer, + Sub /= none -> + true; + (_RosterEntry) -> + false end, - ejabberd_hooks:run_fold(roster_get, LServer, [], - [{LUser, LServer}])). + ejabberd_hooks:run_fold(roster_get, ToServer, [], + [{ToUser, ToServer}])). process_sm_iq_info(From, To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) -> |