mod_admin_telnet: Don't rely on getpeerchain returning an empty list

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 96cc15f26431417d47ebe7447cf0f45c451047d2..d530bb456eeb9e55bce64bd745aa56fb6a8f2ceb 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -15,10 +15,11 @@ local t_concat = table.concat;
 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");
 
@@ -68,7 +69,6 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
                                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
@@ -137,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);