aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-08 16:35:23 +0200
committerKim Alvefur <zash@zash.se>2016-04-08 16:35:23 +0200
commit0c4b70fe8f56d40843d6a7f5123412ab1f09c3df (patch)
tree11acd5b864d9aa9af250484211d2e88296916520
parentbb95b569ef884a8d6558271382acadcac2f87c66 (diff)
downloadprosody-0c4b70fe8f56d40843d6a7f5123412ab1f09c3df.tar.gz
prosody-0c4b70fe8f56d40843d6a7f5123412ab1f09c3df.zip
mod_presence: Construct a 'from' JID when roster items are removed outside of a session
-rw-r--r--plugins/mod_presence.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index d4f2f28d..258c5ea4 100644
--- 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);