Re: [prosody-dev] patch for mod_extdisco.lua

2019-05-23 Thread Kim Alvefur
Hi,

On Wed, May 22, 2019 at 11:27:37PM -0700, Alexey Bobyr wrote:
> According to https://xmpp.org/extensions/attic/xep-0215-0.6.html service 
> tag must is a child element of 'services' tag in reply.
> Attached patch adds main tag services.

Thanks. Patch looks good. I noticed that the other handler has the same issue.

> Please note that https://xmpp.org/extensions/xep-0215.html now contains 
> urn:xmpp:extdisco:2
> So maybe need to change mod_extdisco description that it adds support of 
> XEP-0215 its not true anymore. 

Looks like the incompatible changes between the :1 and :2 namespace
mainly concern service pushes, which is not implemented here.

-- 
Kim "Zash" Alvefur

-- 
You received this message because you are subscribed to the Google Groups 
"prosody-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to prosody-dev+unsubscr...@googlegroups.com.
To post to this group, send email to prosody-dev@googlegroups.com.
Visit this group at https://groups.google.com/group/prosody-dev.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prosody-dev/20190523152417.erwu3hneqc4lg6pn%40carcharodon.zash.se.
For more options, visit https://groups.google.com/d/optout.


[prosody-dev] patch for mod_extdisco.lua

2019-05-23 Thread Alexey Bobyr
Hi,
According to https://xmpp.org/extensions/attic/xep-0215-0.6.html service 
tag must is a child element of 'services' tag in reply.
Attached patch adds main tag services.


Please note that https://xmpp.org/extensions/xep-0215.html now contains 
urn:xmpp:extdisco:2
So maybe need to change mod_extdisco description that it adds support of 
XEP-0215 its not true anymore. 

Current version of mod_extdisco gives support for first version of XEP-0215.

-- 
You received this message because you are subscribed to the Google Groups 
"prosody-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to prosody-dev+unsubscr...@googlegroups.com.
To post to this group, send email to prosody-dev@googlegroups.com.
Visit this group at https://groups.google.com/group/prosody-dev.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prosody-dev/49f6d3cf-1453-4e45-a681-d4ba5c9bcc4d%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
# HG changeset patch
# User Alexey Bobyr
# Date 1558592117 -10800
#  Thu May 23 09:15:17 2019 +0300
# Node ID e302537a0e4e96bf14e2ad5431e02bbd5f3f23ca
# Parent  013ef96a6d4d1a4c1a3000d6eb7322eca6f1a434
xep-0215-0.6 requires service to be wrapped in services tag.

diff -r 013ef96a6d4d -r e302537a0e4e mod_extdisco/mod_extdisco.lua
--- a/mod_extdisco/mod_extdisco.lua	Sat May 18 16:19:03 2019 +0200
+++ b/mod_extdisco/mod_extdisco.lua	Thu May 23 09:15:17 2019 +0300
@@ -10,7 +10,7 @@
 	local origin, stanza = event.origin, event.stanza;
 	local service = stanza:get_child("service", xmlns_extdisco);
 	local service_type = service and service.attr.type;
-	local reply = st.reply(stanza);
+	local reply = st.reply(stanza):tag('services', { xmlns = 'urn:xmpp:extdisco:1' });
 	for host, service_info in pairs(services) do
 		if not(service_type) or service_info.type == service_type then
 			reply:tag("service", {