pubsub: remove useless get_roster_info call

SVN Revision: 1109

diff --git a/ChangeLog b/ChangeLog
index a937478745446cf97073bc5ec173b987ad2b3cd4..6c53e7bf7f98ef3d6ba1a6f278aeb3737a0a2151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-24  Christophe Romain <christophe.romain@process-one.net>
+
+       * src/mod_pubsub/mod_pubsub.erl: remove useless get_roster_info call in
+       presence_probe handling when access rule is presence
+
 2007-12-24  Mickael Remond  <mremond@process-one.net>
 
        * doc/release_notes_2.0.0.txt: ejabberd 2.0.0 beta 1 release

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 96f1f288089af0ce6e13f4ce54bc291cfe7cbeb1..b2f21aff23bf64f10c4707ae2684d1b9f2c197e6 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -461,15 +461,14 @@ handle_cast({presence, From, To, Packet}, State) ->
            on_sub_and_presence ->
                case is_caps_notify(ServerHost, Node, Caps) of
                    true ->
-                       AllowedGroups = get_option(Options, roster_groups_allowed),
-                       {PresenceSubscription, RosterGroup} = get_roster_info(
-                                       To#jid.luser, To#jid.lserver, JID, AllowedGroups),
                        Subscribed = case get_option(Options, access_model) of
                            open -> true;
-                           presence -> PresenceSubscription;
+                           presence -> true;
                            whitelist -> false; % subscribers are added manually
                            authorize -> false; % likewise
-                           roster -> RosterGroup
+                           roster ->
+                               Grps = get_option(Options, roster_groups_allowed),
+                               element(2, get_roster_info(To#jid.luser, To#jid.lserver, JID, Grps))
                        end,
                        if Subscribed ->
                            send_last_item(PepKey, Node, JID);