diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-19 23:45:24 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-19 23:45:24 +0100 |
| commit | 1f1a2de16515a5ab250965768cf76f64271f8884 (patch) | |
| tree | 132f2dc47321aac879254664fa5c81cd818daff4 | |
| parent | f27987785f1a4cce95652eb87eea5d2281d13d4d (diff) | |
| parent | 0213c9ded3d5be56806a5e9e528f61bc37331997 (diff) | |
| download | prosody-1f1a2de16515a5ab250965768cf76f64271f8884.tar.gz prosody-1f1a2de16515a5ab250965768cf76f64271f8884.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_proxy65.lua | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua index 2ed9faac..73527cbc 100644 --- a/plugins/mod_proxy65.lua +++ b/plugins/mod_proxy65.lua @@ -101,27 +101,10 @@ function module.add_host(module) module:log("warn", "proxy65_port is deprecated, please put proxy65_ports = { %d } into the global section instead", legacy_config); end + module:depends("disco"); module:add_identity("proxy", "bytestreams", name); module:add_feature("http://jabber.org/protocol/bytestreams"); - module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function(event) - local origin, stanza = event.origin, event.stanza; - if not stanza.tags[1].attr.node then - origin.send(st.reply(stanza):query("http://jabber.org/protocol/disco#info") - :tag("identity", {category='proxy', type='bytestreams', name=name}):up() - :tag("feature", {var="http://jabber.org/protocol/bytestreams"}) ); - return true; - end - end, -1); - - module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function(event) - local origin, stanza = event.origin, event.stanza; - if not stanza.tags[1].attr.node then - origin.send(st.reply(stanza):query("http://jabber.org/protocol/disco#items")); - return true; - end - end, -1); - module:hook("iq-get/host/http://jabber.org/protocol/bytestreams:query", function(event) local origin, stanza = event.origin, event.stanza; |