1 files changed, 77 insertions, 118 deletions
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index 6a0ab75..d61f369 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -1,137 +1,96 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/JID/JID.h>
-#include <Swiften/Base/API.h>
+#include <map>
+#include <memory>
 #include <string>
+
+#include <boost/signals2.hpp>
+#include <boost/signals2/connection.hpp>
+
+#include <Swiften/Base/API.h>
+#include <Swiften/Elements/Form.h>
+#include <Swiften/Elements/MUCAdminPayload.h>
+#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/Elements/MUCOwnerPayload.h>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/Presence.h>
-#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/JID/JID.h>
 #include <Swiften/MUC/MUCRegistry.h>
-#include <Swiften/Elements/MUCOwnerPayload.h>
-#include <Swiften/Elements/MUCAdminPayload.h>
-#include <Swiften/Elements/Form.h>
-
-#include <boost/shared_ptr.hpp>
-#include <Swiften/Base/boost_bsignals.h>
-#include <boost/signals/connection.hpp>
-
-#include <map>
 
 namespace Swift {
-	class StanzaChannel;
-	class IQRouter;
-	class DirectedPresenceSender;
-
-	class SWIFTEN_API MUC {
-		public:
-			typedef boost::shared_ptr<MUC> ref;
-
-			enum JoinResult { JoinSucceeded, JoinFailed };
-			enum LeavingType { LeavePart, LeaveKick, LeaveBan, LeaveDestroy, LeaveNotMember, Disconnect };
-
-		public:
-			MUC(StanzaChannel* stanzaChannel, IQRouter* iqRouter, DirectedPresenceSender* presenceSender, const JID &muc, MUCRegistry* mucRegistry);
+    class SWIFTEN_API MUC {
+        public:
+            typedef std::shared_ptr<MUC> ref;
 
-			/**
-			 * Returns the (bare) JID of the MUC.
-			 */
-			JID getJID() const {
-				return ownMUCJID.toBare();
-			}
+            enum JoinResult { JoinSucceeded, JoinFailed };
+            enum LeavingType { LeavePart, LeaveKick, LeaveBan, LeaveDestroy, LeaveNotMember, Disconnect };
 
-			/**
-			 * Returns if the room is unlocked and other people can join the room.
-			 * @return True if joinable by others; false otherwise.
-			 */
-			bool isUnlocked() const {
-				return isUnlocked_;
-			}
+        public:
+            virtual ~MUC();
 
-			void joinAs(const std::string &nick);
-			void joinWithContextSince(const std::string &nick, const boost::posix_time::ptime& since);
-			/*void queryRoomInfo(); */
-			/*void queryRoomItems(); */
-			std::string getCurrentNick();
-			std::map<std::string, MUCOccupant> getOccupants() const;
-			void part();
-			void handleIncomingMessage(Message::ref message);
-			/** Expose public so it can be called when e.g. user goes offline */
-			void handleUserLeft(LeavingType);
-			/** Get occupant information*/
-			const MUCOccupant& getOccupant(const std::string& nick);
-			bool hasOccupant(const std::string& nick);
-			void kickOccupant(const JID& jid);
-			void changeOccupantRole(const JID& jid, MUCOccupant::Role role);
-			void requestAffiliationList(MUCOccupant::Affiliation);
-			void changeAffiliation(const JID& jid, MUCOccupant::Affiliation affiliation);
-			void changeSubject(const std::string& subject);
-			void requestConfigurationForm();
-			void configureRoom(Form::ref);
-			void cancelConfigureRoom();
-			void destroyRoom();
-			/** Send an invite for the person to join the MUC */
-			void invitePerson(const JID& person, const std::string& reason = "", bool isImpromptu = false, bool isReuseChat = false);
-			void setCreateAsReservedIfNew() {createAsReservedIfNew = true;}
-			void setPassword(const boost::optional<std::string>& password);
-			
-		public:
-			boost::signal<void (const std::string& /*nick*/)> onJoinComplete;
-			boost::signal<void (ErrorPayload::ref)> onJoinFailed;
-			boost::signal<void (ErrorPayload::ref, const JID&, MUCOccupant::Role)> onRoleChangeFailed;
-			boost::signal<void (ErrorPayload::ref, const JID&, MUCOccupant::Affiliation)> onAffiliationChangeFailed;
-			boost::signal<void (ErrorPayload::ref)> onConfigurationFailed;
-			boost::signal<void (ErrorPayload::ref)> onAffiliationListFailed;
-			boost::signal<void (Presence::ref)> onOccupantPresenceChange;
-			boost::signal<void (const std::string&, const MUCOccupant& /*now*/, const MUCOccupant::Role& /*old*/)> onOccupantRoleChanged;
-			boost::signal<void (const std::string&, const MUCOccupant::Affiliation& /*new*/, const MUCOccupant::Affiliation& /*old*/)> onOccupantAffiliationChanged;
-			boost::signal<void (const MUCOccupant&)> onOccupantJoined;
-			boost::signal<void (const MUCOccupant&, LeavingType, const std::string& /*reason*/)> onOccupantLeft;
-			boost::signal<void (Form::ref)> onConfigurationFormReceived;
-			boost::signal<void (MUCOccupant::Affiliation, const std::vector<JID>&)> onAffiliationListReceived;
-			boost::signal<void ()> onUnlocked;
-			/* boost::signal<void (const MUCInfo&)> onInfoResult; */
-			/* boost::signal<void (const blah&)> onItemsResult; */
-			
+            /**
+             * Returns the (bare) JID of the MUC.
+             */
+            virtual JID getJID() const = 0;
 
-		private:
-			bool isFromMUC(const JID& j) const {
-				return ownMUCJID.equals(j, JID::WithoutResource);
-			}
+            /**
+             * Returns if the room is unlocked and other people can join the room.
+             * @return True if joinable by others; false otherwise.
+             */
+            virtual bool isUnlocked() const = 0;
 
-			const std::string& getOwnNick() const {
-				return ownMUCJID.getResource();
-			}
+            virtual void joinAs(const std::string &nick) = 0;
+            virtual void joinWithContextSince(const std::string &nick, const boost::posix_time::ptime& since) = 0;
+            /*virtual void queryRoomInfo(); */
+            /*virtual void queryRoomItems(); */
+            /*virtual std::string getCurrentNick() = 0; */
+            virtual std::map<std::string, MUCOccupant> getOccupants() const = 0;
+            virtual void changeNickname(const std::string& newNickname) = 0;
+            virtual void part() = 0;
+            /*virtual void handleIncomingMessage(Message::ref message) = 0; */
+            /** Expose public so it can be called when e.g. user goes offline */
+            virtual void handleUserLeft(LeavingType) = 0;
+            /** Get occupant information*/
+            virtual const MUCOccupant& getOccupant(const std::string& nick) = 0;
+            virtual bool hasOccupant(const std::string& nick) = 0;
+            virtual void kickOccupant(const JID& jid) = 0;
+            virtual void changeOccupantRole(const JID& jid, MUCOccupant::Role role) = 0;
+            virtual void requestAffiliationList(MUCOccupant::Affiliation) = 0;
+            virtual void changeAffiliation(const JID& jid, MUCOccupant::Affiliation affiliation) = 0;
+            virtual void changeSubject(const std::string& subject) = 0;
+            virtual void requestConfigurationForm() = 0;
+            virtual void configureRoom(Form::ref) = 0;
+            virtual void cancelConfigureRoom() = 0;
+            virtual void destroyRoom() = 0;
+            /** Send an invite for the person to join the MUC */
+            virtual void invitePerson(const JID& person, const std::string& reason = "", bool isImpromptu = false, bool isReuseChat = false) = 0;
+            virtual void setCreateAsReservedIfNew() = 0;
+            virtual void setPassword(const boost::optional<std::string>& password) = 0;
 
-		private:
-			void handleIncomingPresence(Presence::ref presence);
-			void internalJoin(const std::string& nick);
-			void handleCreationConfigResponse(MUCOwnerPayload::ref, ErrorPayload::ref);
-			void handleOccupantRoleChangeResponse(MUCAdminPayload::ref, ErrorPayload::ref, const JID&, MUCOccupant::Role);
-			void handleAffiliationChangeResponse(MUCAdminPayload::ref, ErrorPayload::ref, const JID&, MUCOccupant::Affiliation);
-			void handleAffiliationListResponse(MUCAdminPayload::ref, ErrorPayload::ref, MUCOccupant::Affiliation);
-			void handleConfigurationFormReceived(MUCOwnerPayload::ref, ErrorPayload::ref);
-			void handleConfigurationResultReceived(MUCOwnerPayload::ref, ErrorPayload::ref);
+        public:
+            boost::signals2::signal<void (const std::string& /*nick*/)> onJoinComplete;
+            boost::signals2::signal<void (ErrorPayload::ref)> onJoinFailed;
+            boost::signals2::signal<void (ErrorPayload::ref, const JID&, MUCOccupant::Role)> onRoleChangeFailed;
+            boost::signals2::signal<void (ErrorPayload::ref, const JID&, MUCOccupant::Affiliation)> onAffiliationChangeFailed;
+            boost::signals2::signal<void (ErrorPayload::ref)> onConfigurationFailed;
+            boost::signals2::signal<void (ErrorPayload::ref)> onAffiliationListFailed;
+            boost::signals2::signal<void (Presence::ref)> onOccupantPresenceChange;
+            boost::signals2::signal<void (const std::string&, const MUCOccupant& /*now*/, const MUCOccupant::Role& /*old*/)> onOccupantRoleChanged;
+            boost::signals2::signal<void (const std::string&, const MUCOccupant::Affiliation& /*new*/, const MUCOccupant::Affiliation& /*old*/)> onOccupantAffiliationChanged;
+            boost::signals2::signal<void (const MUCOccupant&)> onOccupantJoined;
+            boost::signals2::signal<void (const std::string& /*oldNickname*/, const std::string& /*newNickname*/ )> onOccupantNicknameChanged;
+            boost::signals2::signal<void (const MUCOccupant&, LeavingType, const std::string& /*reason*/)> onOccupantLeft;
+            boost::signals2::signal<void (Form::ref)> onConfigurationFormReceived;
+            boost::signals2::signal<void (MUCOccupant::Affiliation, const std::vector<JID>&)> onAffiliationListReceived;
+            boost::signals2::signal<void ()> onUnlocked;
+            /* boost::signals2::signal<void (const MUCInfo&)> onInfoResult; */
+            /* boost::signals2::signal<void (const blah&)> onItemsResult; */
 
-		private:
-			JID ownMUCJID;
-			StanzaChannel* stanzaChannel;
-			IQRouter* iqRouter_;
-			DirectedPresenceSender* presenceSender;
-			MUCRegistry* mucRegistry;
-			std::map<std::string, MUCOccupant> occupants;
-			bool joinSucceeded_;
-			bool joinComplete_;
-			boost::bsignals::scoped_connection scopedConnection_;
-			boost::posix_time::ptime joinSince_;
-			bool createAsReservedIfNew;
-			bool unlocking;
-			bool isUnlocked_;
-			boost::optional<std::string> password;
-	};
+    };
 }