Merge 0.10->trunk

[prosody.git] / plugins / mod_roster.lua

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 0af088cb4b937169bf09b9ccc02add4a1f2879ad..454acebb563ee928486108cb7dfd1a59c69a36b4 100644 (file)
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -134,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 then
-                       if item.subscription == "both" or item.subscription == "from" or roster[false].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}));
+                       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