diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-08-24 20:35:03 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-08-24 20:35:03 +0200 |
| commit | 9851ab0afacd2dd5e5ff54e8f77f92da790279ce (patch) | |
| tree | 1397d227c05ad26b5eeac0924e8422af8ff0a4b8 | |
| parent | 911cd71d123fba6bce1a89bc734c64665bcde3c3 (diff) | |
| download | prosody-9851ab0afacd2dd5e5ff54e8f77f92da790279ce.tar.gz prosody-9851ab0afacd2dd5e5ff54e8f77f92da790279ce.zip | |
mod_time: Simplify iq handling by hooking on iq-get/ instead of iq/.
| -rw-r--r-- | plugins/mod_time.lua | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/plugins/mod_time.lua b/plugins/mod_time.lua index ae7da916..0cd5a4ea 100644 --- a/plugins/mod_time.lua +++ b/plugins/mod_time.lua @@ -16,16 +16,14 @@ module:add_feature("urn:xmpp:time"); local function time_handler(event) local origin, stanza = event.origin, event.stanza; - if stanza.attr.type == "get" then - origin.send(st.reply(stanza):tag("time", {xmlns="urn:xmpp:time"}) - :tag("tzo"):text("+00:00"):up() -- TODO get the timezone in a platform independent fashion - :tag("utc"):text(datetime())); - return true; - end + origin.send(st.reply(stanza):tag("time", {xmlns="urn:xmpp:time"}) + :tag("tzo"):text("+00:00"):up() -- TODO get the timezone in a platform independent fashion + :tag("utc"):text(datetime())); + return true; end -module:hook("iq/bare/urn:xmpp:time:time", time_handler); -module:hook("iq/host/urn:xmpp:time:time", time_handler); +module:hook("iq-get/bare/urn:xmpp:time:time", time_handler); +module:hook("iq-get/host/urn:xmpp:time:time", time_handler); -- XEP-0090: Entity Time (deprecated) @@ -33,12 +31,10 @@ module:add_feature("jabber:iq:time"); local function legacy_time_handler(event) local origin, stanza = event.origin, event.stanza; - if stanza.attr.type == "get" then - origin.send(st.reply(stanza):tag("query", {xmlns="jabber:iq:time"}) - :tag("utc"):text(legacy())); - return true; - end + origin.send(st.reply(stanza):tag("query", {xmlns="jabber:iq:time"}) + :tag("utc"):text(legacy())); + return true; end -module:hook("iq/bare/jabber:iq:time:query", legacy_time_handler); -module:hook("iq/host/jabber:iq:time:query", legacy_time_handler); +module:hook("iq-get/bare/jabber:iq:time:query", legacy_time_handler); +module:hook("iq-get/host/jabber:iq:time:query", legacy_time_handler); |