Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_disco: Rename variables to avoid name clash [luacheck]
authorKim Alvefur <zash@zash.se>
Sat, 01 Apr 2017 22:30:37 +0200
changeset 8044 3b2cc22e9b5b
parent 8043 62c540d51d50
child 8045 5d5afaafac0f
mod_disco: Rename variables to avoid name clash [luacheck]
plugins/mod_disco.lua file | annotate | diff | comparison | revisions 
--- a/plugins/mod_disco.lua	Sat Apr 01 22:18:44 2017 +0200
+++ b/plugins/mod_disco.lua	Sat Apr 01 22:30:37 2017 +0200
@@ -101,10 +101,10 @@
 	local node = stanza.tags[1].attr.node;
 	if node and node ~= "" and node ~= "http://prosody.im#"..get_server_caps_hash() then
 		local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info', node=node});
-		local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
-		local ret = module:fire_event("host-disco-info-node", event);
+		local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+		local ret = module:fire_event("host-disco-info-node", node_event);
 		if ret ~= nil then return ret; end
-		if event.exists then
+		if node_event.exists then
 			origin.send(reply);
 		else
 			origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
@@ -123,10 +123,10 @@
 	local node = stanza.tags[1].attr.node;
 	if node and node ~= "" then
 		local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items', node=node});
-		local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
-		local ret = module:fire_event("host-disco-items-node", event);
+		local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+		local ret = module:fire_event("host-disco-items-node", node_event);
 		if ret ~= nil then return ret; end
-		if event.exists then
+		if node_event.exists then
 			origin.send(reply);
 		else
 			origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
@@ -163,10 +163,10 @@
 		if node and node ~= "" then
 			local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info', node=node});
 			if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
-			local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
-			local ret = module:fire_event("account-disco-info-node", event);
+			local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+			local ret = module:fire_event("account-disco-info-node", node_event);
 			if ret ~= nil then return ret; end
-			if event.exists then
+			if node_event.exists then
 				origin.send(reply);
 			else
 				origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
@@ -189,10 +189,10 @@
 		if node and node ~= "" then
 			local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items', node=node});
 			if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
-			local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
-			local ret = module:fire_event("account-disco-items-node", event);
+			local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+			local ret = module:fire_event("account-disco-items-node", node_event);
 			if ret ~= nil then return ret; end
-			if event.exists then
+			if node_event.exists then
 				origin.send(reply);
 			else
 				origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
prosody