X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_roster.lua;h=40d95be7018b8131c96dce6d130c6ee52e81db38;hb=d631eea82c5144b9c2142b32affdb0ba4f878a43;hp=2eb70df3d44394de30fd9b96b7ae9e096bfd67d8;hpb=0c56db5e9e719bb57f541b427f0481e21da55716;p=prosody.git

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 2eb70df3..40d95be7 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -15,14 +15,15 @@ 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");
 
-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
@@ -63,7 +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 
+				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];
@@ -103,7 +104,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
@@ -137,3 +138,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);