Software / code / prosody
Changeset
7331:c8ad387aab1c
mod_presence, mod_roster: Move responsibility for sending presence on roster removal to mod_presence
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 04 Apr 2016 17:15:10 +0200 |
| parents | 7329:ab811c1bb730 |
| children | 7332:ba32289e8d0b |
| files | plugins/mod_presence.lua plugins/mod_roster.lua |
| diffstat | 2 files changed, 25 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_presence.lua Sun Apr 03 15:52:40 2016 +0200 +++ b/plugins/mod_presence.lua Mon Apr 04 17:15:10 2016 +0200 @@ -357,3 +357,25 @@ 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); +
--- a/plugins/mod_roster.lua Sun Apr 03 15:52:40 2016 +0200 +++ b/plugins/mod_roster.lua Mon Apr 04 17:15:10 2016 +0200 @@ -75,13 +75,9 @@ local roster = session.roster; local r_item = roster[jid]; if r_item then - local to_bare = node and (node.."@"..host) or host; -- bare JID - if r_item.subscription == "both" or r_item.subscription == "from" or roster[false].pending[jid] then - core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare})); - end - if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then - core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare})); - end + module:fire_event("roster-item-removed", { + username = node, jid = jid, item = r_item, origin = session, roster = roster, + }); local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid); if success then session.send(st.reply(stanza));
