From: Christophe Romain <christophe.romain@process-one.net>
Date: Mon, 24 Dec 2007 11:28:56 +0000 (+0000)
Subject: pubsub: remove useless get_roster_info call
X-Git-Tag: v2.0.0~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56194f742bdfd033597484aa1f7d42c255fa5c61;p=ejabberd

pubsub: remove useless get_roster_info call

SVN Revision: 1109
---

diff --git a/ChangeLog b/ChangeLog
index a93747874..6c53e7bf7 100644
--- 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 96f1f2880..b2f21aff2 100644
--- 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);