3 files changed, 60 insertions, 11 deletions
diff --git a/Swiften/Elements/MUCAdminPayload.h b/Swiften/Elements/MUCAdminPayload.h
new file mode 100644
index 0000000..7b3da20
--- /dev/null
+++ b/Swiften/Elements/MUCAdminPayload.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
+#include <string>
+#include <vector>
+
+#include <Swiften/JID/JID.h>
+#include <Swiften/Elements/Payload.h>
+#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/Elements/MUCItem.h>
+
+namespace Swift {
+	class MUCAdminPayload : public Payload {
+		public:
+			typedef boost::shared_ptr<MUCAdminPayload> ref;
+
+
+			MUCAdminPayload() {
+			}
+
+			void addItem(MUCItem item) {items_.push_back(item);}
+
+			const std::vector<MUCItem>& getItems() const {return items_;}
+
+		private:
+			std::vector<MUCItem> items_;
+	};
+}
diff --git a/Swiften/Elements/MUCItem.h b/Swiften/Elements/MUCItem.h
new file mode 100644
index 0000000..86217ec
--- /dev/null
+++ b/Swiften/Elements/MUCItem.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2011 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/JID/JID.h>
+namespace Swift {
+struct MUCItem {
+	MUCItem() {}
+	boost::optional<JID> realJID;
+	boost::optional<std::string> nick;
+	boost::optional<MUCOccupant::Affiliation> affiliation;
+	boost::optional<MUCOccupant::Role> role;
+	boost::optional<JID> actor;
+	boost::optional<std::string> reason;
+};
+}
diff --git a/Swiften/Elements/MUCUserPayload.h b/Swiften/Elements/MUCUserPayload.h
index 0276964..de9f1e5 100644
--- a/Swiften/Elements/MUCUserPayload.h
+++ b/Swiften/Elements/MUCUserPayload.h
@@ -14,20 +14,13 @@
 #include <Swiften/JID/JID.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/Elements/MUCItem.h>
 
 namespace Swift {
 	class MUCUserPayload : public Payload {
 		public:
 			typedef boost::shared_ptr<MUCUserPayload> ref;
 
-			struct Item {
-				Item(MUCOccupant::Affiliation affiliation = MUCOccupant::NoAffiliation, MUCOccupant::Role role = MUCOccupant::NoRole) : affiliation(affiliation), role(role) {}
-				boost::optional<JID> realJID;
-				boost::optional<std::string> nick;
-				MUCOccupant::Affiliation affiliation;
-				MUCOccupant::Role role;
-			};
-
 			struct StatusCode {
 				StatusCode() : code(0) {}
 				int code;
@@ -48,16 +41,16 @@ namespace Swift {
 			MUCUserPayload() {
 			}
 
-			void addItem(Item item) {items_.push_back(item);}
+			void addItem(MUCItem item) {items_.push_back(item);}
 		
 			void addStatusCode(StatusCode code) {statusCodes_.push_back(code);}
 
-			const std::vector<Item>& getItems() const {return items_;}
+			const std::vector<MUCItem>& getItems() const {return items_;}
 
 			const std::vector<StatusCode>& getStatusCodes() const {return statusCodes_;}
 
 		private:
-			std::vector<Item> items_;
+			std::vector<MUCItem> items_;
 			std::vector<StatusCode> statusCodes_;
 	};
 }