aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_roster.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-05 12:48:36 +0200
committerKim Alvefur <zash@zash.se>2016-04-05 12:48:36 +0200
commit69f2c9017677ef6a1bbec03793ee219d16d09f81 (patch)
tree95b6245c2b66f0d5696ba3cb2d43e61ea3a37357 /plugins/mod_roster.lua
parentd00290510d93265adb1ca29f17a15a168349c441 (diff)
parentafcc8898695dd49b60998369e55be70d1a266a82 (diff)
downloadprosody-69f2c9017677ef6a1bbec03793ee219d16d09f81.tar.gz
prosody-69f2c9017677ef6a1bbec03793ee219d16d09f81.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_roster.lua')
-rw-r--r--plugins/mod_roster.lua24
1 files changed, 12 insertions, 12 deletions
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index a674740c..454acebb 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));
@@ -138,16 +134,20 @@ end);
module:hook_global("user-deleted", function(event)
local username, host = event.username, event.host;
+ local origin = event.origin or prosody.hosts[host];
if host ~= module.host then return end
local bare = username .. "@" .. host;
local roster = rm_load_roster(username, host);
for jid, item in pairs(roster) do
if jid then
- if item.subscription == "both" or item.subscription == "from" or roster[false].pending[jid] then
- module:send(st.presence({type="unsubscribed", from=bare, to=jid}));
- end
- if item.subscription == "both" or item.subscription == "to" or item.ask then
- module:send(st.presence({type="unsubscribe", from=bare, to=jid}));
+ module:fire_event("roster-item-removed", {
+ username = username, jid = jid, item = item, roster = roster, origin = origin,
+ });
+ else
+ for jid in pairs(item.pending) do
+ module:fire_event("roster-item-removed", {
+ username = username, jid = jid, roster = roster, origin = origin,
+ });
end
end
end