1 files changed, 15 insertions, 5 deletions
diff --git a/Swift/Controllers/Chat/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index cad0c94..9283438 100644
--- a/Swift/Controllers/Chat/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -35,7 +35,7 @@ namespace Swift {
 	class TimerFactory;
 	class TabComplete;
-	class InviteToChatWindow;
 	class XMPPRoster;
 	class HighlightManager;
+	class UIEvent;
 
 	enum JoinPart {Join, Part, JoinThenPart, PartThenJoin};
@@ -49,15 +49,19 @@ namespace Swift {
 	class MUCController : public ChatControllerBase {
 		public:
-			MUCController(const JID& self, MUC::ref muc, const boost::optional<std::string>& password, const std::string &nick, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, PresenceOracle* presenceOracle, AvatarManager* avatarManager, UIEventStream* events, bool useDelayForLatency, TimerFactory* timerFactory, EventController* eventController, EntityCapsProvider* entityCapsProvider, XMPPRoster* roster, HistoryController* historyController, MUCRegistry* mucRegistry, HighlightManager* highlightManager, ChatMessageParser* chatMessageParser);
+			MUCController(const JID& self, MUC::ref muc, const boost::optional<std::string>& password, const std::string &nick, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, PresenceOracle* presenceOracle, AvatarManager* avatarManager, UIEventStream* events, bool useDelayForLatency, TimerFactory* timerFactory, EventController* eventController, EntityCapsProvider* entityCapsProvider, XMPPRoster* roster, HistoryController* historyController, MUCRegistry* mucRegistry, HighlightManager* highlightManager, ChatMessageParser* chatMessageParser, bool isImpromptu, AutoAcceptMUCInviteDecider* autoAcceptMUCInviteDecider);
 			~MUCController();
 			boost::signal<void ()> onUserLeft;
 			boost::signal<void ()> onUserJoined;
+			boost::signal<void ()> onImpromptuConfigCompleted;
 			virtual void setOnline(bool online);
 			void rejoin();
 			static void appendToJoinParts(std::vector<NickJoinPart>& joinParts, const NickJoinPart& newEvent);
-			static std::string generateJoinPartString(const std::vector<NickJoinPart>& joinParts);
+			static std::string generateJoinPartString(const std::vector<NickJoinPart>& joinParts, bool isImpromptu);
 			static std::string concatenateListOfNames(const std::vector<NickJoinPart>& joinParts);
 			bool isJoined();
 			const std::string& getNick();
+			bool isImpromptu() const;
+			std::map<std::string, JID> getParticipantJIDs() const;
+			void sendInvites(const std::vector<JID>& jids, const std::string& reason) const;
 		
 		protected:
@@ -103,5 +107,5 @@ namespace Swift {
 			void handleConfigurationFormReceived(Form::ref);
 			void handleDestroyRoomRequest();
-			void handleInvitePersonToThisMUCRequest();
+			void handleInvitePersonToThisMUCRequest(const std::vector<JID>& jidsToInvite);
 			void handleConfigurationCancelled();
 			void handleOccupantRoleChangeFailed(ErrorPayload::ref, const JID&, MUCOccupant::Role);
@@ -111,7 +115,12 @@ namespace Swift {
 			void handleInviteToMUCWindowDismissed();
 			void handleInviteToMUCWindowCompleted();
+			void handleUIEvent(boost::shared_ptr<UIEvent> event);
 			void addRecentLogs();
 			void checkDuplicates(boost::shared_ptr<Message> newMessage);
 			void setNick(const std::string& nick);
+			void setImpromptuWindowTitle();
+			void handleRoomUnlocked();
+			void configureAsImpromptuRoom(Form::ref form);
+			Form::ref buildImpromptuRoomConfiguration(Form::ref roomConfigurationForm);
 
 		private:
@@ -133,8 +142,9 @@ namespace Swift {
 			boost::posix_time::ptime lastActivity_;
 			boost::optional<std::string> password_;
-			InviteToChatWindow* inviteWindow_;
 			XMPPRoster* xmppRoster_;
 			std::vector<HistoryMessage> joinContext_;
 			size_t renameCounter_;
+			bool isImpromptu_;
+			bool isImpromptuAlreadyConfigured_;
 	};
 }