Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

pubsub: remove useless get_roster_info call

Browse Source 
SVN Revision: 1109
This commit is contained in:
Christophe Romain 2007-12-24 11:28:56 +00:00
parent 8c4042848e
commit 56194f742b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

9
src/mod_pubsub/mod_pubsub.erl
View File

@ -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);