diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-11-27 21:12:44 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-11-27 21:12:44 +0000 |
| commit | 08b18a9afdd6f4ff8b0eeb7e8e29b27041e45f8d (patch) | |
| tree | c729898281ec51de4eac3c6cef4d8b2f42a04b87 | |
| parent | c84aa2499424c5fedc80e6706d4cb83d61616ea0 (diff) | |
| parent | 41ccb42d862b7ca48a3de4547c2bb4ba2853ac1c (diff) | |
| download | prosody-08b18a9afdd6f4ff8b0eeb7e8e29b27041e45f8d.tar.gz prosody-08b18a9afdd6f4ff8b0eeb7e8e29b27041e45f8d.zip | |
Merge darkrain->trunk
| -rw-r--r-- | plugins/mod_iq.lua | 6 | ||||
| -rw-r--r-- | plugins/mod_pep.lua | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua index e90af781..e077e23d 100644 --- a/plugins/mod_iq.lua +++ b/plugins/mod_iq.lua @@ -37,7 +37,7 @@ module:hook("iq/bare", function(data) 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); else - module:fire_event("iq/bare/"..stanza.attr.id, data); + module:fire_event("iq-"..stanza.attr.type.."/bare/"..stanza.attr.id, data); return true; end end); @@ -49,7 +49,7 @@ module:hook("iq/self", function(data) 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); else - module:fire_event("iq/self/"..stanza.attr.id, data); + module:fire_event("iq-"..stanza.attr.type.."/self/"..stanza.attr.id, data); return true; end end); @@ -61,7 +61,7 @@ module:hook("iq/host", function(data) 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); else - module:fire_event("iq/host/"..stanza.attr.id, data); + module:fire_event("iq-"..stanza.attr.type.."/host/"..stanza.attr.id, data); return true; end end); diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 5d476645..b7f20f2b 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -208,7 +208,7 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event) end end); -module:hook("iq/bare/disco", function(event) +module:hook("iq-result/bare/disco", function(event) local session, stanza = event.origin, event.stanza; if stanza.attr.type == "result" then local disco = stanza.tags[1]; |