mod_disco: Apply minor readability improvements

diff --git a/src/mod_disco.erl b/src/mod_disco.erl
index 724b9b95766e0428071b779e0bedc93cd962ea63..00b65d23edb2b6b8f3d9038d1f99d2985f5b5b0b 100644 (file)
--- 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) ->