From 2f3a3c656759980dd3be17dfc2f41819a347f3ac Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sun, 28 Nov 2010 02:24:26 +0500
Subject: mod_iq: Extra IQ get and set sub-events are now fired:
"iq-{get,set}/{host,self,bare}/xmlns:tag" (when
"iq/{host,self,bare}/xmlns:tag" is unhandled).
---
plugins/mod_iq.lua | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index e077e23d..bc203993 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -35,7 +35,9 @@ module:hook("iq/bare", function(data)
-- TODO fire post processing events
if stanza.attr.type == "get" or stanza.attr.type == "set" then
- return module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ local ret = module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ if ret ~= nil then return ret; end
+ return module:fire_event("iq-"..stanza.attr.type.."/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
else
module:fire_event("iq-"..stanza.attr.type.."/bare/"..stanza.attr.id, data);
return true;
@@ -43,11 +45,13 @@ module:hook("iq/bare", function(data)
end);
module:hook("iq/self", function(data)
- -- IQ to bare JID recieved
+ -- IQ to self JID recieved
local origin, stanza = data.origin, data.stanza;
if stanza.attr.type == "get" or stanza.attr.type == "set" then
- return module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ local ret = module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ if ret ~= nil then return ret; end
+ return module:fire_event("iq-"..stanza.attr.type.."/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
else
module:fire_event("iq-"..stanza.attr.type.."/self/"..stanza.attr.id, data);
return true;
@@ -59,7 +63,9 @@ module:hook("iq/host", function(data)
local origin, stanza = data.origin, data.stanza;
if stanza.attr.type == "get" or stanza.attr.type == "set" then
- return module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ local ret = module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ if ret ~= nil then return ret; end
+ return module:fire_event("iq-"..stanza.attr.type.."/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
else
module:fire_event("iq-"..stanza.attr.type.."/host/"..stanza.attr.id, data);
return true;
--
cgit v1.2.3
From 5c91168bc8d4746e82478a208c8d087145d956fe Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sun, 28 Nov 2010 02:37:18 +0500
Subject: mod_iq: Optimized a bit (fewer table accesses).
---
plugins/mod_iq.lua | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index bc203993..256a9419 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -32,14 +32,15 @@ end);
module:hook("iq/bare", function(data)
-- IQ to bare JID recieved
local origin, stanza = data.origin, data.stanza;
+ local type = stanza.attr.type;
-- TODO fire post processing events
- if stanza.attr.type == "get" or stanza.attr.type == "set" then
+ if type == "get" or type == "set" then
local ret = module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
if ret ~= nil then return ret; end
- return module:fire_event("iq-"..stanza.attr.type.."/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ return module:fire_event("iq-"..type.."/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
else
- module:fire_event("iq-"..stanza.attr.type.."/bare/"..stanza.attr.id, data);
+ module:fire_event("iq-"..type.."/bare/"..stanza.attr.id, data);
return true;
end
end);
@@ -47,13 +48,14 @@ end);
module:hook("iq/self", function(data)
-- IQ to self JID recieved
local origin, stanza = data.origin, data.stanza;
+ local type = stanza.attr.type;
- if stanza.attr.type == "get" or stanza.attr.type == "set" then
+ if type == "get" or type == "set" then
local ret = module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
if ret ~= nil then return ret; end
- return module:fire_event("iq-"..stanza.attr.type.."/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ return module:fire_event("iq-"..type.."/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
else
- module:fire_event("iq-"..stanza.attr.type.."/self/"..stanza.attr.id, data);
+ module:fire_event("iq-"..type.."/self/"..stanza.attr.id, data);
return true;
end
end);
@@ -61,13 +63,14 @@ end);
module:hook("iq/host", function(data)
-- IQ to a local host recieved
local origin, stanza = data.origin, data.stanza;
+ local type = stanza.attr.type;
- if stanza.attr.type == "get" or stanza.attr.type == "set" then
+ if type == "get" or type == "set" then
local ret = module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
if ret ~= nil then return ret; end
- return module:fire_event("iq-"..stanza.attr.type.."/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ return module:fire_event("iq-"..type.."/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
else
- module:fire_event("iq-"..stanza.attr.type.."/host/"..stanza.attr.id, data);
+ module:fire_event("iq-"..type.."/host/"..stanza.attr.id, data);
return true;
end
end);
--
cgit v1.2.3
From 339e703edd098189b555907065fe76c243d542a1 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sun, 28 Nov 2010 02:42:02 +0500
Subject: mod_iq: Optimized a bit more (fewer table accesses).
---
plugins/mod_iq.lua | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 256a9419..c201a465 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -36,9 +36,10 @@ module:hook("iq/bare", function(data)
-- TODO fire post processing events
if type == "get" or type == "set" then
- local ret = module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ local child = stanza.tags[1];
+ local ret = module:fire_event("iq/bare/"..child.attr.xmlns..":"..child.name, data);
if ret ~= nil then return ret; end
- return module:fire_event("iq-"..type.."/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ return module:fire_event("iq-"..type.."/bare/"..child.attr.xmlns..":"..child.name, data);
else
module:fire_event("iq-"..type.."/bare/"..stanza.attr.id, data);
return true;
@@ -51,9 +52,10 @@ module:hook("iq/self", function(data)
local type = stanza.attr.type;
if type == "get" or type == "set" then
- local ret = module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ local child = stanza.tags[1];
+ local ret = module:fire_event("iq/self/"..child.attr.xmlns..":"..child.name, data);
if ret ~= nil then return ret; end
- return module:fire_event("iq-"..type.."/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ return module:fire_event("iq-"..type.."/self/"..child.attr.xmlns..":"..child.name, data);
else
module:fire_event("iq-"..type.."/self/"..stanza.attr.id, data);
return true;
@@ -66,9 +68,10 @@ module:hook("iq/host", function(data)
local type = stanza.attr.type;
if type == "get" or type == "set" then
- local ret = module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ local child = stanza.tags[1];
+ local ret = module:fire_event("iq/host/"..child.attr.xmlns..":"..child.name, data);
if ret ~= nil then return ret; end
- return module:fire_event("iq-"..type.."/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+ return module:fire_event("iq-"..type.."/host/"..child.attr.xmlns..":"..child.name, data);
else
module:fire_event("iq-"..type.."/host/"..stanza.attr.id, data);
return true;
--
cgit v1.2.3