swift · tarun018 · Aug 4, 2017 · Aug 13, 2017 · Aug 17, 2017 · Aug 22, 2017
diff --git a/Limber/MIXMockServer.cpp b/Limber/MIXMockServer.cpp
diff --git a/Limber/SConscript b/Limber/SConscript
@@ -23,6 +23,7 @@ elif env["SCONS_STAGE"] == "build" :
     myenv.UseFlags(env["LIMBER_FLAGS"])
     myenv.UseFlags(env["SWIFTEN_FLAGS"])
     myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
+    myenv.Program("MIXMockServer", ["MIXMockServer.cpp"])
     myenv.Program("limber", ["main.cpp"])
 
     env.Append(UNITTEST_SOURCES = [

diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
@@ -18,6 +18,7 @@
 #include <Swiften/Disco/EntityCapsManager.h>
 #include <Swiften/FileTransfer/FileTransferManagerImpl.h>
 #include <Swiften/Jingle/JingleSessionManager.h>
+#include <Swiften/MIX/MIXRegistry.h>
 #include <Swiften/MUC/MUCManager.h>
 #include <Swiften/MUC/MUCRegistry.h>
 #include <Swiften/Network/NetworkFactories.h>
@@ -58,6 +59,8 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
     directedPresenceSender = new DirectedPresenceSender(stanzaChannelPresenceSender);
     discoManager = new ClientDiscoManager(getIQRouter(), directedPresenceSender, networkFactories->getCryptoProvider());
 
+    mixRegistry = std::make_unique<MIXRegistry>(getJID(), getIQRouter(), getRoster(), getStanzaChannel());
+
     mucRegistry = new MUCRegistry();
     mucManager = new MUCManager(getStanzaChannel(), getIQRouter(), directedPresenceSender, mucRegistry);
 
@@ -118,6 +121,8 @@ Client::~Client() {
     delete avatarManager;
     delete vcardManager;
 
+    mixRegistry.reset();
+
     delete mucManager;
     delete mucRegistry;
 
@@ -148,13 +153,13 @@ void Client::handleConnected() {
     discoManager->handleConnected();
 }
 
-void Client::requestRoster() {
+void Client::requestRoster(bool includeMIX) {
     // FIXME: We should set this once when the session is finished, but there
     // is currently no callback for this
     if (getSession()) {
         rosterController->setUseVersioning(getSession()->getRosterVersioningSupported());
     }
-    rosterController->requestRoster();
+    rosterController->requestRoster(includeMIX);
 }
 
 Presence::ref Client::getLastPresence(const JID& jid) const {

diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
@@ -21,6 +21,7 @@ namespace Swift {
     class FileTransferManager;
     class FileTransferManager;
     class JingleSessionManager;
+    class MIXRegistry;
     class MUCManager;
     class MUCRegistry;
     class MemoryStorages;
@@ -93,7 +94,7 @@ namespace Swift {
              *
              * \see getRoster()
              */
-            void requestRoster();
+            void requestRoster(bool includeMIX = false);
 
             /**
              * Returns the last received presence for the given (full) JID.
@@ -111,6 +112,10 @@ namespace Swift {
 
             PresenceSender* getPresenceSender() const;
 
+            MIXRegistry* getMIXRegistry() const {
+                return mixRegistry.get();
+            }
+
             MUCManager* getMUCManager() const {
                 return mucManager;
             }
@@ -191,6 +196,7 @@ namespace Swift {
             PresenceOracle* presenceOracle;
             DirectedPresenceSender* directedPresenceSender;
             StanzaChannelPresenceSender* stanzaChannelPresenceSender;
+            std::unique_ptr<MIXRegistry> mixRegistry;
             MUCRegistry* mucRegistry;
             VCardManager* vcardManager;
             AvatarManager* avatarManager;

diff --git a/Swiften/Elements/DiscoInfo.cpp b/Swiften/Elements/DiscoInfo.cpp
@@ -26,6 +26,7 @@ const std::string DiscoInfo::MessageDeliveryReceiptsFeature = std::string("urn:x
 const std::string DiscoInfo::WhiteboardFeature = std::string("http://swift.im/whiteboard");
 const std::string DiscoInfo::BlockingCommandFeature = std::string("urn:xmpp:blocking");
 const std::string DiscoInfo::MessageCarbonsFeature = std::string("urn:xmpp:carbons:2");
+const std::string DiscoInfo::MIXFeature = std::string("urn:xmpp:mix:0");
 
 bool DiscoInfo::Identity::operator<(const Identity& other) const {
     if (category_ == other.category_) {

diff --git a/Swiften/Elements/DiscoInfo.h b/Swiften/Elements/DiscoInfo.h
@@ -37,6 +37,7 @@ namespace Swift {
             static const std::string WhiteboardFeature;
             static const std::string BlockingCommandFeature;
             static const std::string MessageCarbonsFeature;
+            static const std::string MIXFeature;
 
             class Identity {
                 public:

diff --git a/Swiften/Elements/RosterItemPayload.h b/Swiften/Elements/RosterItemPayload.h
@@ -17,8 +17,8 @@ namespace Swift {
         public:
             enum Subscription { None, To, From, Both, Remove };
 
-            RosterItemPayload() : subscription_(None), ask_(false) {}
-            RosterItemPayload(const JID& jid, const std::string& name, Subscription subscription, const std::vector<std::string>& groups = std::vector<std::string>()) : jid_(jid), name_(name), subscription_(subscription), groups_(groups), ask_(false) { }
+            RosterItemPayload() : subscription_(None), ask_(false), isMIXChannel_(false) {}
+            RosterItemPayload(const JID& jid, const std::string& name, Subscription subscription, const std::vector<std::string>& groups = std::vector<std::string>()) : jid_(jid), name_(name), subscription_(subscription), groups_(groups), ask_(false) , isMIXChannel_(false) { }
 
             void setJID(const JID& jid) { jid_ = jid; }
             const JID& getJID() const { return jid_; }
@@ -41,12 +41,16 @@ namespace Swift {
                 unknownContent_ += c;
             }
 
+            void setMIXChannel(bool isMIXChannel) { isMIXChannel_ = isMIXChannel; }
+            bool isMIXChannel() const { return isMIXChannel_; }
+
         private:
             JID jid_;
             std::string name_;
             Subscription subscription_;
             std::vector<std::string> groups_;
             bool ask_;
             std::string unknownContent_;
+            bool isMIXChannel_;
     };
 }
diff --git a/Swiften/Elements/RosterPayload.h b/Swiften/Elements/RosterPayload.h
@@ -22,7 +22,7 @@ namespace Swift {
             typedef std::vector<RosterItemPayload> RosterItemPayloads;
 
         public:
-            RosterPayload() {}
+            RosterPayload(bool hasAnnotate = false) : hasAnnotate_(hasAnnotate) {}
 
             boost::optional<RosterItemPayload> getItem(const JID& jid) const;
 
@@ -42,7 +42,16 @@ namespace Swift {
                 version_ = version;
             }
 
+            bool hasRequestMIXAnnotations() const {
+                return hasAnnotate_;
+            }
+
+            void setRequestMIXAnnotations(bool hasAnnotate) {
+                hasAnnotate_ = hasAnnotate;
+            }
+
         private:
+            bool hasAnnotate_;
             RosterItemPayloads items_;
             boost::optional<std::string> version_;
     };