# HG changeset patch
# User Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
# Date 1535138138 -7200
# Node ID b0628bc93acf9ac6704d3dbd3cd2452c90407d20
# Parent  4cdd1ddae72c7880c31dd3c42fff04fc08fa90c9
mod_ipcheck: Simplify iq handling by hooking on iq-get/ instead of iq/.

diff -r 4cdd1ddae72c -r b0628bc93acf mod_ipcheck/mod_ipcheck.lua
--- a/mod_ipcheck/mod_ipcheck.lua	Fri Aug 24 20:55:10 2018 +0200
+++ b/mod_ipcheck/mod_ipcheck.lua	Fri Aug 24 21:15:38 2018 +0200
@@ -6,41 +6,37 @@
 
 module:add_feature("urn:xmpp:sic:0");
 
-module:hook("iq/bare/urn:xmpp:sic:0:ip", function(event)
+module:hook("iq-get/bare/urn:xmpp:sic:0:ip", function(event)
 	local origin, stanza = event.origin, event.stanza;
-	if stanza.attr.type == "get" then
-		if stanza.attr.to then
-			origin.send(st.error_reply(stanza, "auth", "forbidden", "You can only ask about your own IP address"));
-		elseif origin.ip then
-			origin.send(st.reply(stanza):tag("ip", {xmlns='urn:xmpp:sic:0'}):text(origin.ip));
-		else
-			-- IP addresses should normally be available, but in case they are not
-			origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "IP address for this session is not available"));
-		end
-		return true;
+	if stanza.attr.to then
+		origin.send(st.error_reply(stanza, "auth", "forbidden", "You can only ask about your own IP address"));
+	elseif origin.ip then
+		origin.send(st.reply(stanza):tag("ip", {xmlns='urn:xmpp:sic:0'}):text(origin.ip));
+	else
+		-- IP addresses should normally be available, but in case they are not
+		origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "IP address for this session is not available"));
 	end
+	return true;
 end);
 
 module:add_feature("urn:xmpp:sic:1");
 
-module:hook("iq/bare/urn:xmpp:sic:1:address", function(event)
+module:hook("iq-get/bare/urn:xmpp:sic:1:address", function(event)
 	local origin, stanza = event.origin, event.stanza;
-	if stanza.attr.type == "get" then
-		if stanza.attr.to then
-			origin.send(st.error_reply(stanza, "auth", "forbidden", "You can only ask about your own IP address"));
-		elseif origin.ip then
-			local reply = st.reply(stanza):tag("address", {xmlns='urn:xmpp:sic:1'})
-				:tag("ip"):text(origin.ip):up()
-			if origin.conn and origin.conn.port then -- server_event
-				reply:tag("port"):text(tostring(origin.conn:port()))
-			elseif origin.conn and origin.conn.clientport then -- server_select
-				reply:tag("port"):text(tostring(origin.conn:clientport()))
-			end
-			origin.send(reply);
-		else
-			-- IP addresses should normally be available, but in case they are not
-			origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "IP address for this session is not available"));
+	if stanza.attr.to then
+		origin.send(st.error_reply(stanza, "auth", "forbidden", "You can only ask about your own IP address"));
+	elseif origin.ip then
+		local reply = st.reply(stanza):tag("address", {xmlns='urn:xmpp:sic:1'})
+			:tag("ip"):text(origin.ip):up()
+		if origin.conn and origin.conn.port then -- server_event
+			reply:tag("port"):text(tostring(origin.conn:port()))
+		elseif origin.conn and origin.conn.clientport then -- server_select
+			reply:tag("port"):text(tostring(origin.conn:clientport()))
 		end
-		return true;
+		origin.send(reply);
+	else
+		-- IP addresses should normally be available, but in case they are not
+		origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "IP address for this session is not available"));
 	end
+	return true;
 end);