1 files changed, 105 insertions, 101 deletions
diff --git a/Swift/Controllers/Chat/ChatController.h b/Swift/Controllers/Chat/ChatController.h
index f8b6d8b..447e263 100644
--- a/Swift/Controllers/Chat/ChatController.h
+++ b/Swift/Controllers/Chat/ChatController.h
@@ -1,113 +1,117 @@
 /*
- * Copyright (c) 2010-2013 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swift/Controllers/Chat/ChatControllerBase.h>
-
 #include <map>
 #include <string>
 
+#include <Swiften/Base/Tristate.h>
+
+#include <Swift/Controllers/Chat/ChatControllerBase.h>
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
 
 namespace Swift {
-	class AvatarManager;
-	class ChatStateNotifier;
-	class ChatStateTracker;
-	class NickResolver;
-	class EntityCapsProvider;
-	class FileTransferController;
-	class SettingsProvider;
-	class HistoryController;
-	class HighlightManager;
-	class ClientBlockListManager;
-	class UIEvent;
-
-	class ChatController : public ChatControllerBase {
-		public:
-			ChatController(const JID& self, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &contact, NickResolver* nickResolver, PresenceOracle* presenceOracle, AvatarManager* avatarManager, bool isInMUC, bool useDelayForLatency, UIEventStream* eventStream, EventController* eventController, TimerFactory* timerFactory, EntityCapsProvider* entityCapsProvider, bool userWantsReceipts, SettingsProvider* settings, HistoryController* historyController, MUCRegistry* mucRegistry, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, ChatMessageParser* chatMessageParser, AutoAcceptMUCInviteDecider* autoAcceptMUCInviteDecider);
-			virtual ~ChatController();
-			virtual void setToJID(const JID& jid);
-			virtual void setAvailableServerFeatures(boost::shared_ptr<DiscoInfo> info);
-			virtual void setOnline(bool online);
-			virtual void handleNewFileTransferController(FileTransferController* ftc);
-			virtual void handleWhiteboardSessionRequest(bool senderIsSelf);
-			virtual void handleWhiteboardStateChange(const ChatWindow::WhiteboardSessionState state);
-			virtual void setContactIsReceivingPresence(bool /*isReceivingPresence*/);
-			virtual ChatWindow* detachChatWindow();
-
-		protected:
-			void cancelReplaces();
-			JID getBaseJID();
-			void logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool isIncoming);
-
-		private:
-			void handlePresenceChange(boost::shared_ptr<Presence> newPresence);
-			std::string getStatusChangeString(boost::shared_ptr<Presence> presence);
-			bool isIncomingMessageFromMe(boost::shared_ptr<Message> message);
-			void postSendMessage(const std::string &body, boost::shared_ptr<Stanza> sentStanza);
-			void preHandleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent);
-			void postHandleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent, const HighlightAction&);
-			void preSendMessageRequest(boost::shared_ptr<Message>);
-			std::string senderDisplayNameFromMessage(const JID& from);
-			virtual boost::optional<boost::posix_time::ptime> getMessageTimestamp(boost::shared_ptr<Message>) const;
-			void handleStanzaAcked(boost::shared_ptr<Stanza> stanza);
-			void dayTicked() {lastWasPresence_ = false;}
-			void handleContactNickChanged(const JID& jid, const std::string& /*oldNick*/);
-			void handleBareJIDCapsChanged(const JID& jid);
-
-			void handleFileTransferCancel(std::string /* id */);
-			void handleFileTransferStart(std::string /* id */, std::string /* description */);
-			void handleFileTransferAccept(std::string /* id */, std::string /* filename */);
-			void handleSendFileRequest(std::string filename);
-
-			void handleWhiteboardSessionAccept();
-			void handleWhiteboardSessionCancel();
-			void handleWhiteboardWindowShow();
-
-			void handleSettingChanged(const std::string& settingPath);
-			void checkForDisplayingDisplayReceiptsAlert();
-
-			void handleBlockingStateChanged();
-			void handleBlockingItemAdded(const JID&);
-			void handleBlockingItemRemoved(const JID&);
-
-			void handleBlockUserRequest();
-			void handleUnblockUserRequest();
-
-			void handleInviteToChat(const std::vector<JID>& droppedJIDs);
-			void handleInviteToMUCWindowDismissed();
-			void handleInviteToMUCWindowCompleted();
-
-			void handleUIEvent(boost::shared_ptr<UIEvent> event);
-
-		private:
-			NickResolver* nickResolver_;
-			ChatStateNotifier* chatStateNotifier_;
-			ChatStateTracker* chatStateTracker_;
-			std::string myLastMessageUIID_;
-			bool isInMUC_;
-			bool lastWasPresence_;
-			std::string lastStatusChangeString_;
-			std::map<boost::shared_ptr<Stanza>, std::string> unackedStanzas_;
-			std::map<std::string, std::string> requestedReceipts_;
-			StatusShow::Type lastShownStatus_;
-			UIEventStream* eventStream_;
-
-			ChatWindow::Tristate contactSupportsReceipts_;
-			bool receivingPresenceFromUs_;
-			bool userWantsReceipts_;
-			std::map<std::string, FileTransferController*> ftControllers;
-			SettingsProvider* settings_;
-			std::string lastWbID_;
-
-			ClientBlockListManager* clientBlockListManager_;
-			boost::bsignals::scoped_connection blockingOnStateChangedConnection_;
-			boost::bsignals::scoped_connection blockingOnItemAddedConnection_;
-			boost::bsignals::scoped_connection blockingOnItemRemovedConnection_;
-	};
+    class AvatarManager;
+    class ChatStateNotifier;
+    class ChatStateTracker;
+    class ClientBlockListManager;
+    class EntityCapsProvider;
+    class FileTransferController;
+    class HighlightManager;
+    class HistoryController;
+    class NickResolver;
+    class SettingsProvider;
+    class TimerFactory;
+    class UIEvent;
+
+    class ChatController : public ChatControllerBase {
+        public:
+            ChatController(const JID& self, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &contact, NickResolver* nickResolver, PresenceOracle* presenceOracle, AvatarManager* avatarManager, bool isInMUC, bool useDelayForLatency, UIEventStream* eventStream, TimerFactory* timerFactory, EventController* eventController, EntityCapsProvider* entityCapsProvider, bool userWantsReceipts, HistoryController* historyController, MUCRegistry* mucRegistry, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, std::shared_ptr<ChatMessageParser> chatMessageParser, AutoAcceptMUCInviteDecider* autoAcceptMUCInviteDecider, SettingsProvider* settings, Chattables& chattables);
+            virtual ~ChatController() override;
+            virtual void setToJID(const JID& jid) override;
+            virtual void setAvailableServerFeatures(std::shared_ptr<DiscoInfo> info) override;
+            virtual void setOnline(bool online) override;
+            virtual void handleNewFileTransferController(FileTransferController* ftc);
+            virtual void handleWhiteboardSessionRequest(bool senderIsSelf);
+            virtual void handleWhiteboardStateChange(const ChatWindow::WhiteboardSessionState state);
+            virtual void setContactIsReceivingPresence(bool /*isReceivingPresence*/) override;
+            virtual ChatWindow* detachChatWindow() override;
+            virtual void handleIncomingOwnMessage(std::shared_ptr<Message> message) override;
+
+        protected:
+            virtual void cancelReplaces() override;
+            virtual JID getBaseJID() override;
+            virtual void logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool isIncoming) override;
+            virtual bool shouldIgnoreMessage(std::shared_ptr<Message> message) override;
+            virtual JID messageCorrectionJID(const JID& fromJID) override;
+
+        private:
+            void handlePresenceChange(std::shared_ptr<Presence> newPresence);
+            std::string getStatusChangeString(std::shared_ptr<Presence> presence);
+            virtual bool isIncomingMessageFromMe(std::shared_ptr<Message> message) override;
+            virtual void postSendMessage(const std::string &body, std::shared_ptr<Stanza> sentStanza) override;
+            virtual void preHandleIncomingMessage(std::shared_ptr<MessageEvent> messageEvent) override;
+            virtual void addMessageHandleIncomingMessage(const JID& from, const ChatWindow::ChatMessage& message, const std::string& messageID, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const boost::posix_time::ptime& timeStamp) override;
+            virtual void handleIncomingReplaceMessage(const JID& from, const ChatWindow::ChatMessage& message, const std::string& messageID, const std::string& idToReplace, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const boost::posix_time::ptime& timeStamp) override;
+            virtual void postHandleIncomingMessage(std::shared_ptr<MessageEvent> messageEvent, const ChatWindow::ChatMessage& chatMessage) override;
+            virtual void preSendMessageRequest(std::shared_ptr<Message>) override;
+            virtual std::string senderHighlightNameFromMessage(const JID& from) override;
+            virtual std::string senderDisplayNameFromMessage(const JID& from) override;
+            virtual boost::optional<boost::posix_time::ptime> getMessageTimestamp(std::shared_ptr<Message>) const override;
+            void handleStanzaAcked(std::shared_ptr<Stanza> stanza);
+            virtual void dayTicked() override { lastWasPresence_ = false; }
+            void handleContactNickChanged(const JID& jid, const std::string& /*oldNick*/);
+            virtual void handleBareJIDCapsChanged(const JID& jid) override;
+
+            void handleFileTransferCancel(std::string /* id */);
+            void handleFileTransferStart(std::string /* id */, std::string /* description */);
+            void handleFileTransferAccept(std::string /* id */, std::string /* filename */);
+            void handleSendFileRequest(std::string filename);
+
+            void handleWhiteboardSessionAccept();
+            void handleWhiteboardSessionCancel();
+            void handleWhiteboardWindowShow();
+
+            void handleSettingChanged(const std::string& settingPath);
+            void checkForDisplayingDisplayReceiptsAlert();
+
+            void handleBlockingStateChanged();
+            void handleBlockUserRequest();
+            void handleUnblockUserRequest();
+
+            void handleInviteToChat(const std::vector<JID>& droppedJIDs);
+
+            void handleWindowClosed();
+
+            void handleUIEvent(std::shared_ptr<UIEvent> event);
+
+        private:
+            NickResolver* nickResolver_;
+            ChatStateNotifier* chatStateNotifier_;
+            ChatStateTracker* chatStateTracker_;
+            std::string myLastMessageUIID_;
+            bool isInMUC_;
+            std::string lastStatusChangeString_;
+            StatusShow::Type lastShownStatus_;
+
+            Tristate contactSupportsReceipts_;
+            bool receivingPresenceFromUs_ = false;
+            bool userWantsReceipts_;
+            std::map<std::string, FileTransferController*> ftControllers;
+            std::string lastWbID_;
+            std::string lastHandledMessageID_;
+
+            ClientBlockListManager* clientBlockListManager_;
+            boost::signals2::scoped_connection blockingOnStateChangedConnection_;
+            boost::signals2::scoped_connection blockingOnItemAddedConnection_;
+            boost::signals2::scoped_connection blockingOnItemRemovedConnection_;
+            boost::signals2::scoped_connection continuationsBrokenConnection_;
+
+            boost::optional<ChatWindow::AlertID> deliveryReceiptAlert_;
+            boost::optional<ChatWindow::AlertID> blockedContactAlert_;
+    };
 }
-