aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2014-03-27 18:09:42 -0400
committerdaurnimator <quae@daurnimator.com>2014-03-27 18:09:42 -0400
commit2d7176e0945645d177bab94195334a887f4fd001 (patch)
tree0235ed0d0427e78e8b6976d3c4a73c3731b132b1
parent2e431e6c6dbb1b184775d4b47780317688a09443 (diff)
downloadprosody-2d7176e0945645d177bab94195334a887f4fd001.tar.gz
prosody-2d7176e0945645d177bab94195334a887f4fd001.zip
plugins/muc: Rename admin query hook
-rw-r--r--plugins/muc/mod_muc.lua8
-rw-r--r--plugins/muc/muc.lib.lua4
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index e8782414..8759cba4 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -179,8 +179,8 @@ for event_name, method in pairs {
-- Normal room interactions
["iq-get/bare/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
["iq-get/bare/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
- ["iq-set/bare/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_set_command" ;
- ["iq-get/bare/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_get_command" ;
+ ["iq-set/bare/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_set_command" ;
+ ["iq-get/bare/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_get_command" ;
["iq-set/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
["iq-get/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
["message/bare"] = "handle_message_to_room" ;
@@ -188,8 +188,8 @@ for event_name, method in pairs {
-- Host room
["iq-get/host/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
["iq-get/host/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
- ["iq-set/host/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_set_command" ;
- ["iq-get/host/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_get_command" ;
+ ["iq-set/host/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_set_command" ;
+ ["iq-get/host/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_get_command" ;
["iq-set/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
["iq-get/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
["message/host"] = "handle_message_to_room" ;
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index c955d47b..7e41b225 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -900,7 +900,7 @@ function room_mt:handle_disco_items_get_query(origin, stanza)
return true;
end
-function room_mt:handle_admin_item_set_command(origin, stanza)
+function room_mt:handle_admin_query_set_command(origin, stanza)
local item = stanza.tags[1].tags[1];
if item.attr.jid then -- Validate provided JID
item.attr.jid = jid_prep(item.attr.jid);
@@ -933,7 +933,7 @@ function room_mt:handle_admin_item_set_command(origin, stanza)
end
end
-function room_mt:handle_admin_item_get_command(origin, stanza)
+function room_mt:handle_admin_query_get_command(origin, stanza)
local actor = stanza.attr.from;
local affiliation = self:get_affiliation(actor);
local item = stanza.tags[1].tags[1];