aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-04 17:15:10 +0200
committerKim Alvefur <zash@zash.se>2016-04-04 17:15:10 +0200
commit9f6ac546e1dc284d5c25b9994534302e897d6484 (patch)
tree00c13e2e875fb61d859d3352912dd20cb80fa521
parent5e6475392910df01592a526e564634fc19c1c887 (diff)
downloadprosody-9f6ac546e1dc284d5c25b9994534302e897d6484.tar.gz
prosody-9f6ac546e1dc284d5c25b9994534302e897d6484.zip
mod_presence, mod_roster: Move responsibility for sending presence on roster removal to mod_presence
-rw-r--r--plugins/mod_presence.lua22
-rw-r--r--plugins/mod_roster.lua10
2 files changed, 25 insertions, 7 deletions
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);
+
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index a674740c..0af088cb 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -75,13 +75,9 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
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));