Merge 0.9->0.10

[prosody.git] / plugins / mod_presence.lua

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index d4f2f28dff4a4056638514f8612fa8126fe257ac..cf762edc880cf6c5cfa8a05fbb8d0015aadf094f 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -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
@@ -364,18 +365,19 @@ module:hook("roster-item-removed", function (event)
        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=session.full_jid, to=jid}));
+               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=session.full_jid, to=jid}));
+               core_post_stanza(session, st.presence({type="unsubscribe", from=from_jid, to=jid}));
        end
 
 end, -1);