mod_presence: Send unavailable presence when roster items are removed (fixes #331)

[prosody.git] / plugins / mod_presence.lua

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 4ac017ba886f9bd55091171419300d60304237bd..d4f2f28dff4a4056638514f8612fa8126fe257ac 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -27,7 +27,7 @@ local NULL = {};
 local rostermanager = require "core.rostermanager";
 local sessionmanager = require "core.sessionmanager";
 
-local recalc_resource_map = require "util.presencepriority".recalc_resource_map;
+local recalc_resource_map = require "util.presence".recalc_resource_map;
 
 local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false);
 
@@ -357,3 +357,26 @@ module:hook("resource-unbind", function(event)
                session.directed = nil;
        end
 end);
+
+module:hook("roster-item-removed", function (event)
+       local username = event.username;
+       local session = event.origin;
+       local roster = event.roster or session and session.roster;
+       local jid = event.jid;
+       local item = event.item;
+
+       local subscription = item and item.subscription or "none";
+       local ask = item and item.ask;
+       local pending = roster and roster[false].pending[jid];
+
+       if subscription == "both" or subscription == "from" or pending then
+               core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=jid}));
+       end
+
+       if subscription == "both" or subscription == "to" or ask then
+               send_presence_of_available_resources(username, module.host, jid, session, st.presence({type="unavailable"}));
+               core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=jid}));
+       end
+
+end, -1);
+