aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2019-04-30 20:03:02 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2019-05-04 13:44:19 +0200
commit34a9bf3920e88994601305d2b5866bd6915a6b61 (patch)
treef062a9f601474b07db1b92e1974809d09028fb35
parentcaeb6f2608ab0f6e769fb93fef14658bfe165378 (diff)
downloadqxmpp-34a9bf3920e88994601305d2b5866bd6915a6b61.tar.gz
Update implementation of XEP-0369 (v0.14.2) and XEP-0405 (v0.4.0)
The changes in the XEP only affected parts we haven't implemented yet, so updating was rather easy.
Diffstat
-rw-r--r--doc/xep.doc4
-rw-r--r--src/base/QXmppConstants.cpp8
-rw-r--r--src/base/QXmppMixIq.cpp2
-rw-r--r--src/base/QXmppMixIq.h6
-rw-r--r--tests/qxmppmessage/tst_qxmppmessage.cpp2
-rw-r--r--tests/qxmppmixiq/tst_qxmppmixiq.cpp44
6 files changed, 33 insertions, 33 deletions
diff --git a/doc/xep.doc b/doc/xep.doc
index 3b59b37b..c91952e1 100644
--- a/doc/xep.doc
+++ b/doc/xep.doc
@@ -47,7 +47,7 @@ Ongoing:
- XEP-0009: Jabber-RPC (API is not finalized yet)
- XEP-0060: Publish-Subscribe (Only basic IQ implemented)
- XEP-0077: In-Band Registration (Only basic IQ implemented)
-- XEP-0369: Mediated Information eXchange (MIX) (Only IQ queries implemented) (v0.14.1)
-- XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements (Only IQ queries implemented) (v0.3.1)
+- XEP-0369: Mediated Information eXchange (MIX) (Only IQ queries implemented) (v0.14.2)
+- XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements (Only IQ queries implemented) (v0.4.0)
*/
diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp
index 190a10f5..d1be6a6f 100644
--- a/src/base/QXmppConstants.cpp
+++ b/src/base/QXmppConstants.cpp
@@ -133,9 +133,9 @@ const char* ns_chat_markers = "urn:xmpp:chat-markers:0";
// XEP-0352: Client State Indication
const char* ns_csi = "urn:xmpp:csi:0";
// XEP-0369: Mediated Information eXchange (MIX)
-const char* ns_mix = "urn:xmpp:mix:core:0";
-const char* ns_mix_create_channel = "urn:xmpp:mix:core:0#create-channel";
-const char* ns_mix_searchable = "urn:xmpp:mix:core:0#searchable";
+const char* ns_mix = "urn:xmpp:mix:core:1";
+const char* ns_mix_create_channel = "urn:xmpp:mix:core:1#create-channel";
+const char* ns_mix_searchable = "urn:xmpp:mix:core:1#searchable";
const char* ns_mix_node_messages = "urn:xmpp:mix:nodes:messages";
const char* ns_mix_node_participants = "urn:xmpp:mix:nodes:participants";
const char* ns_mix_node_presence = "urn:xmpp:mix:nodes:presence";
@@ -144,6 +144,6 @@ const char* ns_mix_node_info = "urn:xmpp:mix:nodes:info";
// XEP-0382: Spoiler messages
const char* ns_spoiler = "urn:xmpp:spoiler:0";
// XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements
-const char* ns_mix_pam = "urn:xmpp:mix:pam:0";
+const char* ns_mix_pam = "urn:xmpp:mix:pam:1";
const char* ns_mix_roster = "urn:xmpp:mix:roster:0";
const char* ns_mix_presence = "urn:xmpp:presence:0";
diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp
index b0e9f3a1..7cc316e2 100644
--- a/src/base/QXmppMixIq.cpp
+++ b/src/base/QXmppMixIq.cpp
@@ -187,7 +187,7 @@ void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter* writer) const
if (type() == Result)
helperToXmlAddAttribute(writer, "jid", d->jid);
- for (auto node : d->nodes) {
+ for (const auto &node : d->nodes) {
writer->writeStartElement("subscribe");
writer->writeAttribute("node", node);
writer->writeEndElement();
diff --git a/src/base/QXmppMixIq.h b/src/base/QXmppMixIq.h
index 9757d7a0..bc399706 100644
--- a/src/base/QXmppMixIq.h
+++ b/src/base/QXmppMixIq.h
@@ -29,9 +29,9 @@
class QXmppMixIqPrivate;
/// \brief The QXmppMixIq class represents an IQ used to do actions on a MIX
-/// channel as defined by XEP-0369: Mediated Information eXchange (MIX)
-/// (v0.14.1) and XEP-0405: Mediated Information eXchange (MIX): Participant
-/// Server Requirements (v0.3.1).
+/// channel as defined by XEP-0369: Mediated Information eXchange (MIX) and
+/// XEP-0405: Mediated Information eXchange (MIX): Participant Server
+/// Requirements.
///
/// \ingroup Stanzas
diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp
index 9e8786d6..49666168 100644
--- a/tests/qxmppmessage/tst_qxmppmessage.cpp
+++ b/tests/qxmppmessage/tst_qxmppmessage.cpp
@@ -625,7 +625,7 @@ void tst_QXmppMessage::testMix()
"from=\"coven@mix.shakespeare.example/123456\" "
"type=\"groupchat\">"
"<body>Harpier cries: 'tis time, 'tis time.</body>"
- "<mix xmlns=\"urn:xmpp:mix:core:0\">"
+ "<mix xmlns=\"urn:xmpp:mix:core:1\">"
"<jid>hag66@shakespeare.example</jid>"
"<nick>thirdwitch</nick>"
"</mix>"
diff --git a/tests/qxmppmixiq/tst_qxmppmixiq.cpp b/tests/qxmppmixiq/tst_qxmppmixiq.cpp
index bbb484a2..0eb52576 100644
--- a/tests/qxmppmixiq/tst_qxmppmixiq.cpp
+++ b/tests/qxmppmixiq/tst_qxmppmixiq.cpp
@@ -48,8 +48,8 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<client-join xmlns=\"urn:xmpp:mix:pam:0\" channel=\"coven@mix.shakespeare.example\">"
- "<join xmlns=\"urn:xmpp:mix:core:0\">"
+ "<client-join xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
+ "<join xmlns=\"urn:xmpp:mix:core:1\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
@@ -64,7 +64,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"coven@mix.shakespeare.example\" "
"from=\"hag66@shakespeare.example\" "
"type=\"set\">"
- "<join xmlns=\"urn:xmpp:mix:core:0\">"
+ "<join xmlns=\"urn:xmpp:mix:core:1\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
@@ -78,7 +78,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"coven@mix.shakespeare.example\" "
"type=\"result\">"
- "<join xmlns=\"urn:xmpp:mix:core:0\" jid=\"123456#coven@mix.shakespeare.example\">"
+ "<join xmlns=\"urn:xmpp:mix:core:1\" jid=\"123456#coven@mix.shakespeare.example\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
@@ -92,8 +92,8 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"from=\"hag66@shakespeare.example\" "
"type=\"result\">"
- "<client-join xmlns=\"urn:xmpp:mix:pam:0\">"
- "<join xmlns=\"urn:xmpp:mix:core:0\" "
+ "<client-join xmlns=\"urn:xmpp:mix:pam:1\">"
+ "<join xmlns=\"urn:xmpp:mix:core:1\" "
"jid=\"123456#coven@mix.shakespeare.example\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
@@ -108,8 +108,8 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<client-leave xmlns=\"urn:xmpp:mix:pam:0\" channel=\"coven@mix.shakespeare.example\">"
- "<leave xmlns=\"urn:xmpp:mix:core:0\"/>"
+ "<client-leave xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
+ "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
"</client-leave>"
"</iq>"
);
@@ -118,7 +118,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"coven@mix.shakespeare.example\" "
"from=\"hag66@shakespeare.example\" "
"type=\"set\">"
- "<leave xmlns=\"urn:xmpp:mix:core:0\"/>"
+ "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
"</iq>"
);
QByteArray leaveS2sResultXml(
@@ -126,7 +126,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"coven@mix.shakespeare.example\" "
"type=\"result\">"
- "<leave xmlns=\"urn:xmpp:mix:core:0\"/>"
+ "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
"</iq>"
);
QByteArray leaveC2sResultXml(
@@ -134,8 +134,8 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"from=\"hag66@shakespeare.example\" "
"type=\"result\">"
- "<client-leave xmlns=\"urn:xmpp:mix:pam:0\">"
- "<leave xmlns=\"urn:xmpp:mix:core:0\"/>"
+ "<client-leave xmlns=\"urn:xmpp:mix:pam:1\">"
+ "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
"</client-leave>"
"</iq>"
);
@@ -144,7 +144,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<update-subscription xmlns=\"urn:xmpp:mix:core:0\">"
+ "<update-subscription xmlns=\"urn:xmpp:mix:core:1\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"</update-subscription>"
"</iq>"
@@ -154,7 +154,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"from=\"hag66@shakespeare.example\" "
"type=\"result\">"
- "<update-subscription xmlns=\"urn:xmpp:mix:core:0\" jid=\"hag66@shakespeare.example\">"
+ "<update-subscription xmlns=\"urn:xmpp:mix:core:1\" jid=\"hag66@shakespeare.example\">"
"<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
"</update-subscription>"
"</iq>"
@@ -164,7 +164,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<setnick xmlns=\"urn:xmpp:mix:core:0\">"
+ "<setnick xmlns=\"urn:xmpp:mix:core:1\">"
"<nick>thirdwitch</nick>"
"</setnick>"
"</iq>"
@@ -174,7 +174,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"from=\"hag66@shakespeare.example\" "
"type=\"result\">"
- "<setnick xmlns=\"urn:xmpp:mix:core:0\">"
+ "<setnick xmlns=\"urn:xmpp:mix:core:1\">"
"<nick>thirdwitch</nick>"
"</setnick>"
"</iq>"
@@ -184,7 +184,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<create xmlns=\"urn:xmpp:mix:core:0\" channel=\"coven\"/>"
+ "<create xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
"</iq>"
);
QByteArray createWithoutNameXml(
@@ -192,7 +192,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<create xmlns=\"urn:xmpp:mix:core:0\"/>"
+ "<create xmlns=\"urn:xmpp:mix:core:1\"/>"
"</iq>"
);
QByteArray destroyXml(
@@ -200,7 +200,7 @@ void tst_QXmppMixIq::testBase_data()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<destroy xmlns=\"urn:xmpp:mix:core:0\" channel=\"coven\"/>"
+ "<destroy xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
"</iq>"
);
QByteArray emptyXml(
@@ -379,7 +379,7 @@ void tst_QXmppMixIq::testIsMixIq()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<destroy xmlns=\"urn:xmpp:mix:core:0\" channel=\"coven\"/>"
+ "<destroy xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
"</iq>"
);
const QByteArray truePamXml(
@@ -387,8 +387,8 @@ void tst_QXmppMixIq::testIsMixIq()
"to=\"hag66@shakespeare.example\" "
"from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
"type=\"set\">"
- "<client-leave xmlns=\"urn:xmpp:mix:pam:0\" channel=\"coven@mix.shakespeare.example\">"
- "<leave xmlns=\"urn:xmpp:mix:core:0\"/>"
+ "<client-leave xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
+ "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
"</client-leave>"
"</iq>"
);
generated by cgit v1.2.3 (git 2.39.1) at 2026-07-16 21:32:41 +0000