Merge 0.9->0.10

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 574b114110cf9a328e29ca1ef42215a64fcad0fc..56af53684c304c3f621ffdbe60a542d1e8762721 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -12,16 +12,18 @@ local st = require "util.stanza"
 local jid_split = require "util.jid".split;
 local jid_prep = require "util.jid".prep;
 local t_concat = table.concat;
-local tostring = tostring;
+local tonumber = tonumber;
+local pairs, ipairs = pairs, ipairs;
 
+local rm_load_roster = require "core.rostermanager".load_roster;
 local rm_remove_from_roster = require "core.rostermanager".remove_from_roster;
 local rm_add_to_roster = require "core.rostermanager".add_to_roster;
 local rm_roster_push = require "core.rostermanager".roster_push;
-local core_post_stanza = core_post_stanza;
+local core_post_stanza = prosody.core_post_stanza;
 
 module:add_feature("jabber:iq:roster");
 
-local rosterver_stream_feature = st.stanza("ver", {xmlns="urn:xmpp:features:rosterver"}):tag("optional"):up();
+local rosterver_stream_feature = st.stanza("ver", {xmlns="urn:xmpp:features:rosterver"});
 module:hook("stream-features", function(event)
        local origin, features = event.origin, event.features;
        if origin.username then
@@ -34,10 +36,10 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
 
        if stanza.attr.type == "get" then
                local roster = st.reply(stanza);
-               
+
                local client_ver = tonumber(stanza.tags[1].attr.ver);
                local server_ver = tonumber(session.roster[false].version or 1);
-               
+
                if not (client_ver and server_ver) or client_ver ~= server_ver then
                        roster:query("jabber:iq:roster");
                        -- Client does not support versioning, or has stale roster
@@ -62,12 +64,11 @@ 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 
+                               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
                        local item = query.tags[1];
                        local from_node, from_host = jid_split(stanza.attr.from);
-                       local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
                        local jid = jid_prep(item.attr.jid);
                        local node, host, resource = jid_split(jid);
                        if not resource and host then
@@ -102,7 +103,7 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
                                                else
                                                        r_item.subscription = "none";
                                                end
-                                               for _, child in ipairs(item) do 
+                                               for _, child in ipairs(item) do
                                                        if child.name == "group" then
                                                                local text = t_concat(child);
                                                                if text and text ~= "" then
@@ -136,3 +137,20 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
        end
        return true;
 end);
+
+module:hook_global("user-deleted", function(event)
+       local username, host = event.username, event.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}));
+                       end
+               end
+       end
+end, 300);