aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-08 17:54:50 +0200
committerKim Alvefur <zash@zash.se>2016-04-08 17:54:50 +0200
commit7f668a8d577b71115bf3193b7c34bee75b61fdf1 (patch)
tree8cabfe532140fe1b4028c9e6a15c0f700f3e900c
parent619e2c834d19364137a8bd112c126ef6197b6bac (diff)
parent6ff1b30f47299861e35162b538e9db6f5c52bf85 (diff)
downloadprosody-7f668a8d577b71115bf3193b7c34bee75b61fdf1.tar.gz
prosody-7f668a8d577b71115bf3193b7c34bee75b61fdf1.zip
Merge 0.10->trunk
-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..5e1eb404 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 = 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);