mam in progress

include/iris/xmpp_carbons.h

@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/xmpp_carbons.h"

include/iris/xmpp_forwarding.h

@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/xmpp_forwarding.h"

src/xmpp/CMakeLists.txt

@@ -26,9 +26,11 @@ set(HEADERS
     xmpp-im/xmpp_thumbs.h
     xmpp-im/xmpp_agentitem.h
     xmpp-im/xmpp_captcha.h
+    xmpp-im/xmpp_carbons.h
     xmpp-im/xmpp_chatstate.h
     xmpp-im/xmpp_discoitem.h
     xmpp-im/xmpp_features.h
+    xmpp-im/xmpp_forwarding.h
     xmpp-im/xmpp_htmlelement.h
     xmpp-im/xmpp_httpauthrequest.h
     xmpp-im/xmpp_liveroster.h
@@ -113,9 +115,11 @@ set(SOURCES
     xmpp-im/xmpp_bitsofbinary.cpp
     xmpp-im/xmpp_bytestream.cpp
     xmpp-im/xmpp_caps.cpp
+    xmpp-im/xmpp_carbons.cpp
     xmpp-im/xmpp_discoinfotask.cpp
     xmpp-im/xmpp_discoitem.cpp
     xmpp-im/xmpp_ibb.cpp
+    xmpp-im/xmpp_forwarding.cpp
     xmpp-im/xmpp_serverinfomanager.cpp
     xmpp-im/xmpp_subsets.cpp
     xmpp-im/xmpp_task.cpp

src/xmpp/xmpp-im/client.cpp

@@ -79,6 +79,7 @@
 #include "xmpp_bitsofbinary.h"
 #include "filetransfer.h"
 #include "xmpp_caps.h"
+#include "xmpp_carbons.h"
 #include "xmpp_hash.h"
 #include "xmpp_serverinfomanager.h"
 #include "protocol.h"
@@ -132,6 +133,7 @@ class Client::ClientPrivate
     LiveRoster roster;
     ResourceList resourceList;
     CapsManager *capsman = nullptr;
+    CarbonsManager *carbonsman = nullptr;
     S5BManager *s5bman = nullptr;
     Jingle::S5B::Manager *jingleS5BManager = nullptr;
     IBBManager *ibbman = nullptr;
@@ -142,6 +144,7 @@ class Client::ClientPrivate
     Jingle::Manager *jingleManager = nullptr;
     QList<GroupChat> groupChatList;
     EncryptionHandler *encryptionHandler = nullptr;
+    JT_PushMessage *pushMessage = nullptr;
 };
 
 
@@ -225,8 +228,9 @@ void Client::start(const QString &host, const QString &user, const QString &pass
     connect(pp, SIGNAL(subscription(Jid,QString,QString)), SLOT(ppSubscription(Jid,QString,QString)));
     connect(pp, SIGNAL(presence(Jid,Status)), SLOT(ppPresence(Jid,Status)));
 
-    JT_PushMessage *pm = new JT_PushMessage(rootTask(), d->encryptionHandler);
-    connect(pm, SIGNAL(message(Message)), SLOT(pmMessage(Message)));
+    d->pushMessage = new JT_PushMessage(rootTask(), d->encryptionHandler);
+    connect(d->pushMessage, SIGNAL(message(Message)), SLOT(pmMessage(Message)));
+    d->carbonsman = new CarbonsManager(d->pushMessage);
 
     JT_PushRoster *pr = new JT_PushRoster(rootTask());
     connect(pr, SIGNAL(roster(Roster)), SLOT(prRoster(Roster)));
@@ -286,6 +290,16 @@ ServerInfoManager *Client::serverInfoManager() const
     return d->serverInfoManager;
 }
 
+CarbonsManager *Client::carbonsManager() const
+{
+    return d->carbonsman;
+}
+
+JT_PushMessage *Client::pushMessage() const
+{
+    return d->pushMessage;
+}
+
 HttpFileUploadManager *Client::httpFileUploadManager() const
 {
     return d->httpFileUploadManager;

src/xmpp/xmpp-im/types.cpp

@@ -26,6 +26,8 @@
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_ibb.h"
 #include "xmpp_captcha.h"
+#include "xmpp_forwarding.h"
+#include "xmpp_carbons.h"
 #include "protocol.h"
 #include "xmpp/blake2/blake2qt.h"
 #define NS_XML     "http://www.w3.org/XML/1998/namespace"
@@ -1056,7 +1058,6 @@ class Message::Private : public QSharedData
     QMap<QString,HTMLElement> htmlElements;
     QDomElement sxe;
     QList<BoBData> bobDataList;
-    Jid forwardedFrom;
 
     QList<int> mucStatuses;
     QList<MUCInvite> mucInvites;
@@ -1067,12 +1068,12 @@ class Message::Private : public QSharedData
     bool spooled = false, wasEncrypted = false;
 
     //XEP-0280 Message Carbons
-    bool isDisabledCarbons = false;
-    Message::CarbonDir carbonDir = Message::NoCarbon; // it's a forwarded message
+    bool carbonsPrivate = false;
     Message::ProcessingHints processingHints;
     QString replaceId;
     QString originId; // XEP-0359
     Message::StanzaId stanzaId; // XEP-0359
+    Forwarding forwarding;
 };
 
 #define MessageD() (d? d : (d = new Private))
@@ -1624,34 +1625,55 @@ IBBData Message::ibbData() const
     return d? d->ibbData: IBBData();
 }
 
-void Message::setDisabledCarbons(bool disabled)
-{
-    MessageD()->isDisabledCarbons = disabled;
+//! \brief Returns Jid of the remote contact
+//!
+//! Returns Jid of the remote contact for the original message
+//! which may be wrapped using carbons. It is useful when a client
+//! needs to know in which window it should display the message.
+//! So it is not always just from().
+Jid Message::displayJid() const
+{
+    if (!d)
+        return Jid();
+
+    switch (d->forwarding.type()) {
+    case Forwarding::ForwardedCarbonsSent:
+        return d->forwarding.message().to();
+    case Forwarding::ForwardedCarbonsReceived:
+        return d->forwarding.message().from();
+    default:
+        break;
+    }
+    return from();
 }
 
-bool Message::isDisabledCarbons() const
+//! \brief Returns either the message inside the carbons or itself.
+Message Message::displayMessage() const
 {
-    return d && d->isDisabledCarbons;
+    if (d && d->forwarding.isCarbons() && d->forwarding.message())
+        return d->forwarding.message();
+
+    return *this;
 }
 
-void Message::setCarbonDirection(Message::CarbonDir cd)
+void Message::setCarbonsPrivate(bool enable)
 {
-    MessageD()->carbonDir = cd;
+    MessageD()->carbonsPrivate = enable;
 }
 
-Message::CarbonDir Message::carbonDirection() const
+bool Message::carbonsPrivate() const
 {
-    return d? d->carbonDir: NoCarbon;
+    return (d && d->carbonsPrivate);
 }
 
-void Message::setForwardedFrom(const Jid &jid)
+void Message::setForwarded(const Forwarding &frw)
 {
-    MessageD()->forwardedFrom = jid;
+    MessageD()->forwarding = frw;
 }
 
-Jid Message::forwardedFrom() const
+const Forwarding &Message::forwarded() const
 {
-    return d? d->forwardedFrom: Jid();
+    return d->forwarding;
 }
 
 bool Message::spooled() const
@@ -1922,10 +1944,10 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // Avoiding Carbons
-    if (isDisabledCarbons() || wasEncrypted()) {
-        QDomElement e = s.createElement("urn:xmpp:carbons:2","private");
-        s.appendChild(e);
+    if (d->carbonsPrivate || d->wasEncrypted) {
+        s.appendChild(CarbonsManager::privateElement(stream->doc()));
     }
+
     if (!d->replaceId.isEmpty()) {
         QDomElement e = s.createElement("urn:xmpp:message-correct:0", "replace");
         e.setAttribute("id", d->replaceId);
@@ -1962,6 +1984,10 @@ Stanza Message::toStanza(Stream *stream) const
         s.appendChild(e);
     }
 
+    // XEP-0297: Stanza Forwarding
+    if (d->forwarding.type() != Forwarding::ForwardedNone)
+        s.appendChild(d->forwarding.toXml(stream));
+
     return s;
 }