Software /
code /
prosody
Diff
plugins/mod_roster.lua @ 7786:b62353e6a8e5
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 14 Dec 2016 01:47:19 +0100 |
parent | 7783:f54c960240da |
child | 8644:3b28c7728e3f |
line wrap: on
line diff
--- a/plugins/mod_roster.lua Sat Dec 10 02:55:38 2016 +0100 +++ b/plugins/mod_roster.lua Wed Dec 14 01:47:19 2016 +0100 @@ -19,7 +19,6 @@ local rm_remove_from_roster = require "core.rostermanager".remove_from_roster; local rm_add_to_roster = require "core.rostermanager".add_to_roster; local rm_roster_push = require "core.rostermanager".roster_push; -local core_post_stanza = prosody.core_post_stanza; module:add_feature("jabber:iq:roster"); @@ -136,7 +135,6 @@ 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 @@ -144,9 +142,9 @@ username = username, jid = jid, item = item, roster = roster, origin = origin, }); else - for jid in pairs(item.pending) do + for pending_jid in pairs(item.pending) do module:fire_event("roster-item-removed", { - username = username, jid = jid, roster = roster, origin = origin, + username = username, jid = pending_jid, roster = roster, origin = origin, }); end end