mod_presence: Construct a 'from' JID when roster items are removed outside of a session

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index d4f2f28dff4a4056638514f8612fa8126fe257ac..258c5ea475f556bd3712ac264b6822baa59c6c70 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -364,18 +364,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 = origin.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);