Merge 0.10->trunk

[prosody.git] / plugins / mod_presence.lua

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 4ac017ba886f9bd55091171419300d60304237bd..e4a317bc1f843ec04aa8c0f3057fd1c72b182f86 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);
 
@@ -130,7 +130,7 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
        if h and h.type == "local" then
                local u = h.sessions[user];
                if u then
-                       for k, session in pairs(u.sessions) do
+                       for _, session in pairs(u.sessions) do
                                local pres = session.presence;
                                if pres then
                                        if stanza then pres = stanza; pres.attr.from = session.full_jid; end
@@ -178,6 +178,7 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
                end
                core_post_stanza(origin, stanza);
                send_presence_of_available_resources(node, host, to_bare, origin);
+               core_post_stanza(origin, st.presence({ type = "probe", from = from_bare, to = to_bare }));
        elseif stanza.attr.type == "unsubscribed" then
                -- 1. send unavailable
                -- 2. route stanza
@@ -357,3 +358,27 @@ 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 from_jid = session.full_jid or (username .. "@" .. module.host);
+
+       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=from_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=from_jid, to=jid}));
+       end
+
+end, -1);
+