aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-11-26 12:57:24 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-11-26 12:57:24 +0500
commita3c705d9eee18ba2a0b6145e1b417386fd9b32d6 (patch)
tree2481c41b5ce19247f6ac3df872a7389775b094d9
parent87a1d736ac75699142ec49232536a6fb7417302b (diff)
downloadprosody-a3c705d9eee18ba2a0b6145e1b417386fd9b32d6.tar.gz
prosody-a3c705d9eee18ba2a0b6145e1b417386fd9b32d6.zip
mod_roster: Ask remote server to remove pending subscription requests when removing roster items.
-rw-r--r--plugins/mod_roster.lua16
1 files changed, 9 insertions, 7 deletions
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 7ca22aa1..52c61a26 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -74,18 +74,20 @@ module:add_iq_handler("c2s", "jabber:iq:roster",
if not resource and host then
if jid ~= from_node.."@"..from_host then
if item.attr.subscription == "remove" then
- local r_item = session.roster[jid];
+ local roster = session.roster;
+ local r_item = roster[jid];
if r_item then
+ local to_bare = node and (node.."@"..host) or host; -- bare JID
+ if r_item.subscription == "both" or r_item.subscription == "from" or (roster.pending and roster.pending[jid]) then
+ core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare}));
+ end
+ if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then
+ core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare}));
+ end
local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid);
if success then
session.send(st.reply(stanza));
rm_roster_push(from_node, from_host, jid);
- local to_bare = node and (node.."@"..host) or host; -- bare JID
- if r_item.subscription == "both" or r_item.subscription == "from" then
- core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare}));
- elseif r_item.subscription == "both" or r_item.subscription == "to" then
- core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare}));
- end
else
session.send(st.error_reply(stanza, err_type, err_cond, err_msg));
end