Mercurial > prosody-hg

comparison plugins/mod_roster.lua @ 7331:c8ad387aab1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2aae36312eb9
children 9d0e65d919e8
comparison
equal deleted inserted replaced
7329:ab811c1bb730 7331:c8ad387aab1c
73 if jid ~= from_node.."@"..from_host then 73 if jid ~= from_node.."@"..from_host then
74 if item.attr.subscription == "remove" then 74 if item.attr.subscription == "remove" then
75 local roster = session.roster; 75 local roster = session.roster;
76 local r_item = roster[jid]; 76 local r_item = roster[jid];
77 if r_item then 77 if r_item then
78 local to_bare = node and (node.."@"..host) or host; -- bare JID 78 module:fire_event("roster-item-removed", {
79 if r_item.subscription == "both" or r_item.subscription == "from" or roster[false].pending[jid] then 79 username = node, jid = jid, item = r_item, origin = session, roster = roster,
80 core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare})); 80 });
81 end
82 if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then
83 core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare}));
84 end
85 local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid); 81 local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid);
86 if success then 82 if success then
87 session.send(st.reply(stanza)); 83 session.send(st.reply(stanza));
88 rm_roster_push(from_node, from_host, jid); 84 rm_roster_push(from_node, from_host, jid);
89 else 85 else