From 1ba4eb02f5015a0fcc5d7bdce03bac62e4b0f183 Mon Sep 17 00:00:00 2001 From: Juan Aragon Date: Tue, 20 May 2014 14:52:45 +0100 Subject: XEP-0333: Chat Markers --- src/base/QXmppMessage.cpp | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) (limited to 'src/base/QXmppMessage.cpp') diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index e32465b7..c4743b98 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -48,6 +48,13 @@ static const char* message_types[] = { "headline" }; +static const char* marker_types[] = { + "", + "received", + "displayed", + "acknowledged" +}; + static const char *ns_xhtml = "http://www.w3.org/1999/xhtml"; enum StampType @@ -80,6 +87,12 @@ public: QString mucInvitationJid; QString mucInvitationPassword; QString mucInvitationReason; + + // XEP-0333: Chat Markers + bool markable; + QXmppMessage::Marker marker; + QString markedId; + QString markedThread; }; /// Constructs a QXmppMessage. @@ -101,6 +114,9 @@ QXmppMessage::QXmppMessage(const QString& from, const QString& to, const d->body = body; d->thread = thread; d->receiptRequested = false; + + d->markable = false; + d->marker = NoMarker; } /// Constructs a copy of \a other. @@ -363,6 +379,40 @@ namespace } } +bool QXmppMessage::isMarkable() const +{ + return d->markable; +} + +void QXmppMessage::setMarkable(const bool markable) +{ + d->markable = markable; +} + +QXmppMessage::Marker QXmppMessage::marker() const +{ + return d->marker; +} + +QString QXmppMessage::markedId() const +{ + return d->markedId; +} + +QString QXmppMessage::markedThread() const +{ + return d->markedThread; +} + +void QXmppMessage::setMarker(const Marker marker, + const QString& id, + const QString& thread) +{ + d->marker = marker; + d->markedId = id; + d->markedThread = thread; +} + /// \cond void QXmppMessage::parse(const QDomElement &element) { @@ -433,6 +483,36 @@ void QXmppMessage::parse(const QDomElement &element) // XEP-0224: Attention d->attentionRequested = element.firstChildElement("attention").namespaceURI() == ns_attention; + // XEP-0333: Chat Markers + QDomElement markableElement = element.firstChildElement("markable"); + if (!markableElement.isNull()) + { + d->markable = true; + } + // check for all the marker types + QDomElement chatStateElement; + QXmppMessage::Marker marker = QXmppMessage::NoMarker; + for (int i = Received; i <= Acknowledged; i++) + { + chatStateElement = element.firstChildElement(marker_types[i]); + if (!chatStateElement.isNull() && + chatStateElement.namespaceURI() == ns_chat_markers) + { + marker = static_cast(i); + break; + } + } + // if marker is present, check it's the right ns + if (!chatStateElement.isNull()) + { + if (chatStateElement.namespaceURI() == ns_chat_markers) + { + d->marker = marker; + d->markedId = chatStateElement.attribute("id", QString()); + d->markedThread = chatStateElement.attribute("thread", QString()); + } + } + const QList > &knownElems = knownMessageSubelems(); QXmppElementList extensions; @@ -555,6 +635,22 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const xmlWriter->writeEndElement(); } + // XEP-0333: Chat Markers + if (d->markable) { + xmlWriter->writeStartElement("markable"); + xmlWriter->writeAttribute("xmlns", ns_chat_markers); + xmlWriter->writeEndElement(); + } + if (d->marker != NoMarker) { + xmlWriter->writeStartElement(marker_types[d->marker]); + xmlWriter->writeAttribute("xmlns", ns_chat_markers); + xmlWriter->writeAttribute("id", d->markedId); + if (!d->markedThread.isNull() && !d->markedThread.isEmpty()) { + xmlWriter->writeAttribute("thread", d->markedThread); + } + xmlWriter->writeEndElement(); + } + // other extensions QXmppStanza::extensionsToXml(xmlWriter); -- cgit v1.2.3 From 599cf81e6a785d8c748db375f9959547392e4467 Mon Sep 17 00:00:00 2001 From: Juan Aragon Date: Wed, 21 May 2014 16:09:23 +0100 Subject: XEP-0333 updated: -Methods documented -Symmetrical getters/setters -Unit tests updated --- src/base/QXmppMessage.cpp | 48 ++++++++++++++++++++++++++------- src/base/QXmppMessage.h | 11 +++++--- tests/qxmppmessage/tst_qxmppmessage.cpp | 15 ++++++++--- 3 files changed, 58 insertions(+), 16 deletions(-) (limited to 'src/base/QXmppMessage.cpp') diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index c4743b98..4bdc6329 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -379,38 +379,68 @@ namespace } } +/// Returns true if a message is markable, as defined +/// XEP-0333: Chat Markers. + bool QXmppMessage::isMarkable() const { return d->markable; } +/// Sets if the message is markable, as defined +/// XEP-0333: Chat Markers. + void QXmppMessage::setMarkable(const bool markable) { d->markable = markable; } -QXmppMessage::Marker QXmppMessage::marker() const -{ - return d->marker; -} +/// Returns the message's marker id, as defined +/// XEP-0333: Chat Markers. QString QXmppMessage::markedId() const { return d->markedId; } +/// Sets the message's marker id, as defined +/// XEP-0333: Chat Markers. + +void QXmppMessage::setMarkerId(const QString &markerId) +{ + d->markedId = markerId; +} + +/// Returns the message's marker thread, as defined +/// XEP-0333: Chat Markers. + QString QXmppMessage::markedThread() const { return d->markedThread; } -void QXmppMessage::setMarker(const Marker marker, - const QString& id, - const QString& thread) +/// Sets the message's marked thread, as defined +/// XEP-0333: Chat Markers. + +void QXmppMessage::setMarkedThread(const QString &markedThread) +{ + d->markedThread = markedThread; +} + +/// Returns the message's marker, as defined +/// XEP-0333: Chat Markers. + +QXmppMessage::Marker QXmppMessage::marker() const +{ + return d->marker; +} + +/// Sets the message's marker, as defined +/// XEP-0333: Chat Markers + +void QXmppMessage::setMarker(const Marker marker) { d->marker = marker; - d->markedId = id; - d->markedThread = thread; } /// \cond diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h index 193ac6d2..119dba3e 100644 --- a/src/base/QXmppMessage.h +++ b/src/base/QXmppMessage.h @@ -119,11 +119,16 @@ public: // XEP-0333 bool isMarkable() const; void setMarkable(const bool); - Marker marker() const; + QString markedId() const; + void setMarkerId(const QString&); + QString markedThread() const; - void setMarker(const Marker, const QString& id, const QString& thread = QString()); - + void setMarkedThread(const QString&); + + Marker marker() const; + void setMarker(const Marker); + /// \cond void parse(const QDomElement &element); void toXml(QXmlStreamWriter *writer) const; diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index d97f45c6..1ec4f18b 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -465,7 +465,8 @@ void tst_QXmppMessage::testChatMarkers() ""); serialisationMessage.setMarkable(false); - serialisationMessage.setMarker(QXmppMessage::Received, "message-2"); + serialisationMessage.setMarker(QXmppMessage::Received); + serialisationMessage.setMarkerId("message-2"); serializePacket(serialisationMessage, receivedSerialisation); const QByteArray receivedThreadSerialisation( @@ -479,7 +480,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Received, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Received); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, receivedThreadSerialisation); const QByteArray displayedThreadSerialisation( @@ -493,7 +496,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Displayed, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Displayed); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, displayedThreadSerialisation); const QByteArray acknowledgedThreadSerialisation( @@ -507,7 +512,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Acknowledged, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Acknowledged); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, acknowledgedThreadSerialisation); } -- cgit v1.2.3