1 files changed, 19 insertions, 10 deletions
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index 45bcbd3..2a327f4 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -1,49 +1,58 @@
-#ifndef SWIFTEN_MUC_H
-#define SWIFTEN_MUC_H
+#pragma once
 
 #include "Swiften/JID/JID.h"
 #include "Swiften/Base/String.h"
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/MUC/MUCOccupant.h"
 
 #include <boost/signals.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <map>
 
 namespace Swift {
 	class StanzaChannel;
+	class PresenceSender;
 
 	class MUC {
 		public:
 			enum JoinResult { JoinSucceeded, JoinFailed };
 			enum LeavingType { Part };
 
 		public:
-			MUC(StanzaChannel* stanzaChannel, const JID &muc);
-			~MUC();
+			MUC(StanzaChannel* stanzaChannel, PresenceSender* presenceSender, const JID &muc);
 
 			void joinAs(const String &nick);
 			String getCurrentNick();
 			void part();
 			void handleIncomingMessage(boost::shared_ptr<Message> message);
 
 		public:
 			boost::signal<void (JoinResult)> onJoinComplete;
 			boost::signal<void (boost::shared_ptr<Message>)> onMessageReceived;
 			boost::signal<void (boost::shared_ptr<Presence>)> onOccupantPresenceChange;
 			boost::signal<void (const MUCOccupant&)> onOccupantJoined;
 			/**Occupant, type, and reason. */
 			boost::signal<void (const MUCOccupant&, LeavingType, const String&)> onOccupantLeft;
 
 		private:
+			bool isFromMUC(const JID& j) const {
+				return ownMUCJID.equals(j, JID::WithoutResource);
+			}
+
+			const String& getOwnNick() const {
+				return ownMUCJID.getResource();
+			}
+
+		private:
 			void handleIncomingPresence(boost::shared_ptr<Presence> presence);
-			JID muc_;
-			StanzaChannel *stanzaChannel_;
-			String myNick_;
-			std::map<String, MUCOccupant> occupants_;
+
+		private:
+			JID ownMUCJID;
+			StanzaChannel* stanzaChannel;
+			PresenceSender* presenceSender;
+			std::map<String, MUCOccupant> occupants;
+			bool firstPresenceSeen;
 	};
 }
-
-#endif