mam in progress

.gitignore

@@ -17,6 +17,6 @@ object_script.*
 /bin
 /lib
 /plugins
+*.user*
 build-*
-*.pro.user*
 3rdparty/qca

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"

include/iris/xmpp_mammanager.h

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

include/iris/xmpp_mamtask.h

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

src/xmpp/CMakeLists.txt

@@ -31,10 +31,12 @@ set(XMPP_IM_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_form.h
+    xmpp-im/xmpp_forwarding.h
     xmpp-im/xmpp_htmlelement.h
     xmpp-im/xmpp_httpauthrequest.h
     xmpp-im/xmpp_liveroster.h
@@ -69,6 +71,8 @@ set(XMPP_IM_HEADERS
     xmpp-im/xmpp_bytestream.h
     xmpp-im/xmpp_client.h
     xmpp-im/xmpp_discoinfotask.h
+    xmpp-im/xmpp_mamtask.h
+    xmpp-im/xmpp_mammanager.h
     xmpp-im/xmpp_ibb.h
     xmpp-im/xmpp_serverinfomanager.h
     xmpp-im/xmpp_task.h
@@ -121,10 +125,14 @@ target_sources(iris PRIVATE
     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_hash.cpp
     xmpp-im/xmpp_ibb.cpp
+    xmpp-im/xmpp_forwarding.cpp
+    xmpp-im/xmpp_mamtask.cpp
+    xmpp-im/xmpp_mammanager.cpp
     xmpp-im/xmpp_reference.cpp
     xmpp-im/xmpp_serverinfomanager.cpp
     xmpp-im/xmpp_subsets.cpp

src/xmpp/xmpp-im/client.cpp

@@ -79,6 +79,7 @@
 #include "xmpp/xmpp-core/protocol.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_caps.h"
+#include "xmpp_carbons.h"
 #include "xmpp_externalservicediscovery.h"
 #include "xmpp_hash.h"
 #include "xmpp_ibb.h"
@@ -134,6 +135,7 @@ class Client::ClientPrivate {
     LiveRoster                roster;
     ResourceList              resourceList;
     CapsManager              *capsman                  = nullptr;
+    CarbonsManager           *carbonsman               = nullptr;
     TcpPortReserver          *tcpPortReserver          = nullptr;
     S5BManager               *s5bman                   = nullptr;
     Jingle::S5B::Manager     *jingleS5BManager         = nullptr;
@@ -149,6 +151,7 @@ class Client::ClientPrivate {
     Jingle::Manager          *jingleManager            = nullptr;
     QList<GroupChat>          groupChatList;
     EncryptionHandler        *encryptionHandler = nullptr;
+    JT_PushMessage           *pushMessage       = nullptr;
 };
 
 Client::Client(QObject *par) : QObject(par)
@@ -237,8 +240,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)));
@@ -305,6 +309,10 @@ Jingle::Manager *Client::jingleManager() const { return d->jingleManager; }
 
 bool Client::isActive() const { return d->active; }
 
+CarbonsManager *Client::carbonsManager() const { return d->carbonsman; }
+
+JT_PushMessage *Client::pushMessage() const { return d->pushMessage; }
+
 QString Client::groupChatPassword(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);

src/xmpp/xmpp-im/types.cpp

@@ -21,7 +21,9 @@
 #include "xmpp/xmpp-core/protocol.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_captcha.h"
+#include "xmpp_carbons.h"
 #include "xmpp_features.h"
+#include "xmpp_forwarding.h"
 #include "xmpp_ibb.h"
 #include "xmpp_reference.h"
 #include "xmpp_xmlcommon.h"
@@ -732,7 +734,6 @@ class Message::Private : public QSharedData {
     QMap<QString, HTMLElement> htmlElements;
     QDomElement                sxe;
     QList<BoBData>             bobDataList;
-    Jid                        forwardedFrom;
 
     QList<int>       mucStatuses;
     QList<MUCInvite> mucInvites;
@@ -743,14 +744,14 @@ 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
     QString                  encryptionProtocol; // XEP-0380
     Message::StanzaId        stanzaId;           // XEP-0359
     QList<Reference>         references;         // XEP-0385 and XEP-0372
+    Forwarding               forwarding;         // XEP-0297
     Message::Reactions       reactions;          // XEP-0444
     QString                  retraction;         // XEP-0424
 };
@@ -1134,17 +1135,44 @@ QList<BoBData> Message::bobDataList() const { return d ? d->bobDataList : QList<
 
 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();
+}
+
+//! \brief Returns either the message inside the carbons or itself.
+Message Message::displayMessage() const
+{
+    if (d && d->forwarding.isCarbons())
+        return d->forwarding.message();
 
-bool Message::isDisabledCarbons() const { return d && d->isDisabledCarbons; }
+    return *this;
+}
 
-void Message::setCarbonDirection(Message::CarbonDir cd) { MessageD()->carbonDir = cd; }
+void Message::setCarbonsPrivate(bool enable) { MessageD()->carbonsPrivate = enable; }
 
-Message::CarbonDir Message::carbonDirection() const { return d ? d->carbonDir : NoCarbon; }
+bool Message::carbonsPrivate() const { return (d && d->carbonsPrivate); }
 
-void Message::setForwardedFrom(const Jid &jid) { MessageD()->forwardedFrom = jid; }
+void Message::setForwarded(const Forwarding &frw) { MessageD()->forwarding = frw; }
 
-Jid Message::forwardedFrom() const { return d ? d->forwardedFrom : Jid(); }
+const Forwarding &Message::forwarded() const { return d->forwarding; }
 
 bool Message::spooled() const { return d && d->spooled; }
 
@@ -1400,10 +1428,10 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // Avoiding Carbons
-    if (isDisabledCarbons()) {
-        QDomElement e = s.createElement("urn:xmpp:carbons:2", "private");
-        s.appendChild(e);
+    if (d->carbonsPrivate) {
+        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);
@@ -1440,6 +1468,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));
+
     // XEP-0372 and XEP-0385
     for (auto const &r : std::as_const(d->references)) {
         s.appendChild(r.toXml(&s.doc()));