From 9f6ac546e1dc284d5c25b9994534302e897d6484 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 4 Apr 2016 17:15:10 +0200 Subject: mod_presence, mod_roster: Move responsibility for sending presence on roster removal to mod_presence --- plugins/mod_presence.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'plugins/mod_presence.lua') diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 64d5a47b..5562fecf 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -357,3 +357,25 @@ module:hook("resource-unbind", function(event) session.directed = nil; end end); + +module:hook("roster-item-removed", function (event) + local username = event.username; + local session = event.origin; + local roster = event.roster or session and session.roster; + local jid = event.jid; + local item = event.item; + + 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})); + end + + if subscription == "both" or subscription == "to" or ask then + core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=jid})); + end + +end, -1); + -- cgit v1.2.3 From 1e3a0dc5df58ff9e5d1f518e63dec18b3499bf46 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 4 Apr 2016 17:15:47 +0200 Subject: mod_presence: Send unavailable presence when roster items are removed (fixes #331) --- plugins/mod_presence.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/mod_presence.lua') diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 5562fecf..d4f2f28d 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -374,6 +374,7 @@ module:hook("roster-item-removed", function (event) 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})); end -- cgit v1.2.3