aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-14 01:47:19 +0100
committerKim Alvefur <zash@zash.se>2016-12-14 01:47:19 +0100
commit90de22b946faec770a3acffb6b7744f4f6f9f9b0 (patch)
tree7d28b4edd259140fcdf70663b3a4bf06f5a6c7f2 /plugins
parent21a13c5bca4e9f3b87dff4edfb0a291da128b8a3 (diff)
parent2c7554d63405a862ae1681c52b24de1efe350a96 (diff)
downloadprosody-90de22b946faec770a3acffb6b7744f4f6f9f9b0.tar.gz
prosody-90de22b946faec770a3acffb6b7744f4f6f9f9b0.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_roster.lua6
-rw-r--r--plugins/mod_saslauth.lua2
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 454acebb..24c50678 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -19,7 +19,6 @@ local rm_load_roster = require "core.rostermanager".load_roster;
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 @@ 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
@@ -144,9 +142,9 @@ module:hook_global("user-deleted", function(event)
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
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index bb36600b..9917c303 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -273,7 +273,7 @@ module:hook("s2s-stream-features", function(event)
end
end);
-module:hook("iq/self/urn:ietf:params:xml:ns:xmpp-bind:bind", function(event)
+module:hook("stanza/iq/urn:ietf:params:xml:ns:xmpp-bind:bind", function(event)
local origin, stanza = event.origin, event.stanza;
local resource;
if stanza.attr.type == "set" then