Merge 0.9->0.10

[prosody.git] / plugins / mod_presence.lua

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 258c5ea475f556bd3712ac264b6822baa59c6c70..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,7 +365,7 @@ 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 = origin.full_jid or (username .. "@" .. module.host);
+       local from_jid = session.full_jid or (username .. "@" .. module.host);
 
        local subscription = item and item.subscription or "none";
        local ask = item and item.ask;