Merge 0.10->trunk

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 56af53684c304c3f621ffdbe60a542d1e8762721..454acebb563ee928486108cb7dfd1a59c69a36b4 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -44,7 +44,7 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
                        roster:query("jabber:iq:roster");
                        -- Client does not support versioning, or has stale roster
                        for jid, item in pairs(session.roster) do
-                               if jid ~= "pending" and jid then
+                               if jid then
                                        roster:tag("item", {
                                                jid = jid,
                                                subscription = item.subscription,
@@ -64,9 +64,7 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
        else -- stanza.attr.type == "set"
                local query = stanza.tags[1];
                if #query.tags == 1 and query.tags[1].name == "item"
-                               and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid
-                               -- Protection against overwriting roster.pending, until we move it
-                               and query.tags[1].attr.jid ~= "pending" then
+                               and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid then
                        local item = query.tags[1];
                        local from_node, from_host = jid_split(stanza.attr.from);
                        local jid = jid_prep(item.attr.jid);
@@ -77,13 +75,9 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
                                                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
+                                                       module:fire_event("roster-item-removed", {
+                                                               username = node, jid = jid, item = r_item, origin = session, roster = roster,
+                                                       });
                                                        local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid);
                                                        if success then
                                                                session.send(st.reply(stanza));
@@ -140,16 +134,20 @@ end);
 
 module:hook_global("user-deleted", function(event)
        local username, host = event.username, event.host;
+       local origin = event.origin or prosody.hosts[host];
        if host ~= module.host then return end
        local bare = username .. "@" .. host;
        local roster = rm_load_roster(username, host);
        for jid, item in pairs(roster) do
-               if jid and jid ~= "pending" then
-                       if item.subscription == "both" or item.subscription == "from" or (roster.pending and roster.pending[jid]) then
-                               module:send(st.presence({type="unsubscribed", from=bare, to=jid}));
-                       end
-                       if item.subscription == "both" or item.subscription == "to" or item.ask then
-                               module:send(st.presence({type="unsubscribe", from=bare, to=jid}));
+               if jid then
+                       module:fire_event("roster-item-removed", {
+                               username = username, jid = jid, item = item, roster = roster, origin = origin,
+                       });
+               else
+                       for jid in pairs(item.pending) do
+                               module:fire_event("roster-item-removed", {
+                                       username = username, jid = jid, roster = roster, origin = origin,
+                               });
                        end
                end
        end