aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-05-27 19:47:52 +0200
committerKim Alvefur <zash@zash.se>2020-05-27 19:47:52 +0200
commit1c0950bc362d76da12c33ea7e0f87545556c2a82 (patch)
tree8e519ef4514a1d6a9a507b4b09c8ca8326af7d34
parent9eb8214030a32056841d8cc537430e7dccab1c33 (diff)
downloadprosody-1c0950bc362d76da12c33ea7e0f87545556c2a82.tar.gz
prosody-1c0950bc362d76da12c33ea7e0f87545556c2a82.zip
mod_server_contact_info: Add status-addresses field
XEP-0157 version 1.1.0
-rw-r--r--doc/doap.xml2
-rw-r--r--plugins/mod_server_contact_info.lua1
-rw-r--r--spec/scansion/prosody.cfg.lua1
-rw-r--r--spec/scansion/server_contact_info.scs3
4 files changed, 6 insertions, 1 deletions
diff --git a/doc/doap.xml b/doc/doap.xml
index 4937ccb7..ef1437e7 100644
--- a/doc/doap.xml
+++ b/doc/doap.xml
@@ -284,7 +284,7 @@
<implements>
<xmpp:SupportedXep>
<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html"/>
- <xmpp:version>1.0.1</xmpp:version>
+ <xmpp:version>1.1.0</xmpp:version>
<xmpp:since>0.10</xmpp:since>
</xmpp:SupportedXep>
</implements>
diff --git a/plugins/mod_server_contact_info.lua b/plugins/mod_server_contact_info.lua
index 0110ceaf..9c916ebc 100644
--- a/plugins/mod_server_contact_info.lua
+++ b/plugins/mod_server_contact_info.lua
@@ -16,6 +16,7 @@ local form_layout = require "util.dataforms".new({
{ name = "feedback", var = "feedback-addresses", type = "list-multi" },
{ name = "sales", var = "sales-addresses", type = "list-multi" },
{ name = "security", var = "security-addresses", type = "list-multi" },
+ { name = "status", var = "status-addresses", type = "list-multi" },
{ name = "support", var = "support-addresses", type = "list-multi" },
});
diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index c3f56108..0bf68ddb 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -73,6 +73,7 @@ contact_info = {
feedback = { "http://localhost/feedback.html", "mailto:feedback@localhost", "xmpp:feedback@localhost" };
sales = { "xmpp:sales@localhost" };
security = { "xmpp:security@localhost" };
+ status = { "gopher://status.localhost" };
support = { "https://localhost/support.html", "xmpp:support@localhost" };
}
diff --git a/spec/scansion/server_contact_info.scs b/spec/scansion/server_contact_info.scs
index 15537e11..6efc7fd1 100644
--- a/spec/scansion/server_contact_info.scs
+++ b/spec/scansion/server_contact_info.scs
@@ -42,6 +42,9 @@ Romeo receives:
<field type='list-multi' var='security-addresses'>
<value>xmpp:security@localhost</value>
</field>
+ <field type='list-multi' var='status-addresses'>
+ <value>gopher://status.localhost</value>
+ </field>
<field type='list-multi' var='support-addresses'>
<value>https://localhost/support.html</value>
<value>xmpp:support@localhost</value>