From 0c4b70fe8f56d40843d6a7f5123412ab1f09c3df Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 8 Apr 2016 16:35:23 +0200 Subject: mod_presence: Construct a 'from' JID when roster items are removed outside of a session --- plugins/mod_presence.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins') 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); -- cgit v1.2.3 From 6ff1b30f47299861e35162b538e9db6f5c52bf85 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 8 Apr 2016 17:14:58 +0200 Subject: mod_presence: Fix variable name --- plugins/mod_presence.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 258c5ea4..5e1eb404 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -364,7 +364,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; -- cgit v1.2.3