1 files changed, 40 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h
index 70c1ec8..c9dd856 100644
--- a/Swift/Controllers/Chat/ChatsManager.h
+++ b/Swift/Controllers/Chat/ChatsManager.h
@@ -12,4 +12,5 @@
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/Message.h>
@@ -18,8 +19,12 @@
 #include <Swiften/MUC/MUCRegistry.h>
 #include <Swiften/MUC/MUCBookmark.h>
+#include <Swiften/MUC/MUC.h>
 
+
+#include <Swift/Controllers/ContactProvider.h>
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 #include <Swift/Controllers/UIInterfaces/ChatListWindow.h>
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
+#include <Swift/Controllers/UIInterfaces/ChatWindowFactory.h>
 
 
@@ -30,5 +35,4 @@ namespace Swift {
 	class MUCController;
 	class MUCManager;
-	class ChatWindowFactory;
 	class JoinMUCWindow;
 	class JoinMUCWindowFactory;
@@ -56,8 +60,11 @@ namespace Swift {
 	class ClientBlockListManager;
 	class ChatMessageParser;
+	class DiscoServiceWalker;
+	class AutoAcceptMUCInviteDecider;
+	class UserSearchController;
 
-	class ChatsManager {
+	class ChatsManager : public ContactProvider {
 		public:
-			ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, JoinMUCWindowFactory* joinMUCWindowFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, PresenceSender* presenceSender, UIEventStream* uiEventStream, ChatListWindowFactory* chatListWindowFactory, bool useDelayForLatency, TimerFactory* timerFactory, MUCRegistry* mucRegistry, EntityCapsProvider* entityCapsProvider, MUCManager* mucManager, MUCSearchWindowFactory* mucSearchWindowFactory, ProfileSettingsProvider* profileSettings, FileTransferOverview* ftOverview, XMPPRoster* roster, bool eagleMode, SettingsProvider* settings, HistoryController* historyController_, WhiteboardManager* whiteboardManager, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, const std::map<std::string, std::string>& emoticons);
+			ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, JoinMUCWindowFactory* joinMUCWindowFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, PresenceSender* presenceSender, UIEventStream* uiEventStream, ChatListWindowFactory* chatListWindowFactory, bool useDelayForLatency, TimerFactory* timerFactory, MUCRegistry* mucRegistry, EntityCapsProvider* entityCapsProvider, MUCManager* mucManager, MUCSearchWindowFactory* mucSearchWindowFactory, ProfileSettingsProvider* profileSettings, FileTransferOverview* ftOverview, XMPPRoster* roster, bool eagleMode, SettingsProvider* settings, HistoryController* historyController_, WhiteboardManager* whiteboardManager, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, const std::map<std::string, std::string>& emoticons, UserSearchController* inviteUserSearchController);
 			virtual ~ChatsManager();
 			void setAvatarManager(AvatarManager* avatarManager);
@@ -65,9 +72,25 @@ namespace Swift {
 			void setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info);
 			void handleIncomingMessage(boost::shared_ptr<Message> message);
+			std::vector<ChatListWindow::Chat> getRecentChats() const;
+			virtual std::vector<Contact> getContacts();
+
+			boost::signal<void (bool supportsImpromptu)> onImpromptuMUCServiceDiscovered;
+
+		private:
+			class SingleChatWindowFactoryAdapter : public ChatWindowFactory {
+				public:
+					SingleChatWindowFactoryAdapter(ChatWindow* chatWindow);
+					virtual ~SingleChatWindowFactoryAdapter();
+					virtual ChatWindow* createChatWindow(const JID &, UIEventStream*);
+
+				private:
+					ChatWindow* chatWindow_;
+			};
 
 		private:
 			ChatListWindow::Chat createChatListChatItem(const JID& jid, const std::string& activity);
 			void handleChatRequest(const std::string& contact);
-			void handleJoinMUCRequest(const JID& muc, const boost::optional<std::string>& password, const boost::optional<std::string>& nick, bool addAutoJoin, bool createAsReservedIfNew);
+			void finalizeImpromptuJoin(MUC::ref muc, const std::vector<JID>& jidsToInvite, const std::string& reason, const boost::optional<JID>& reuseChatJID = boost::optional<JID>());
+			MUC::ref handleJoinMUCRequest(const JID& muc, const boost::optional<std::string>& password, const boost::optional<std::string>& nick, bool addAutoJoin, bool createAsReservedIfNew, bool isImpromptu, ChatWindow* reuseChatwindow = 0);
 			void handleSearchMUCRequest();
 			void handleMUCSelectedAfterSearch(const JID&);
@@ -83,4 +106,5 @@ namespace Swift {
 			void handleWhiteboardSessionRequest(const JID& contact, bool senderIsSelf);
 			void handleWhiteboardStateChange(const JID& contact, const ChatWindow::WhiteboardSessionState state);
+			boost::optional<ChatListWindow::Chat> removeExistingChat(const ChatListWindow::Chat& chat);
 			void appendRecent(const ChatListWindow::Chat& chat);
 			void prependRecent(const ChatListWindow::Chat& chat);
@@ -100,6 +124,12 @@ namespace Swift {
 			void handleSettingChanged(const std::string& settingPath);
 			void markAllRecentsOffline();
+			void handleTransformChatToMUC(ChatController* chatController, ChatWindow* chatWindow, const std::vector<JID>& jidsToInvite, const std::string& reason);
+
+			void handleLocalServiceFound(const JID& service, boost::shared_ptr<DiscoInfo> info);
+			void handleLocalServiceWalkFinished();
 
 			void updatePresenceReceivingStateOnChatController(const JID&);
+			ChatListWindow::Chat updateChatStatusAndAvatarHelper(const ChatListWindow::Chat& chat) const;
+
 
 			ChatController* getChatControllerOrFindAnother(const JID &contact);
@@ -111,4 +141,5 @@ namespace Swift {
 			std::map<JID, MUCController*> mucControllers_;
 			std::map<JID, ChatController*> chatControllers_;
+			std::map<ChatControllerBase*, SingleChatWindowFactoryAdapter*> chatWindowFactoryAdapters_;
 			EventController* eventController_;
 			JID jid_;
@@ -145,4 +176,9 @@ namespace Swift {
 			ClientBlockListManager* clientBlockListManager_;
 			ChatMessageParser* chatMessageParser_;
+			JID localMUCServiceJID_;
+			boost::shared_ptr<DiscoServiceWalker> localMUCServiceFinderWalker_;
+			AutoAcceptMUCInviteDecider* autoAcceptMUCInviteDecider_;
+			UserSearchController* inviteUserSearchController_;
+			IDGenerator idGenerator_;
 	};
 }