5 files changed, 105 insertions, 9 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
index caf1d9c..e407876 100644
--- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
@@ -13,6 +13,7 @@
 #include "Swiften/Serializer/PayloadSerializers/ErrorSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/RosterSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h"
+#include "Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SoftwareVersionSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/StatusSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/StatusShowSerializer.h"
diff --git a/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp
index 9630014..36aa47f 100644
--- a/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp
@@ -1,19 +1,21 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h"
 
+#include "Swiften/Serializer/XML/XMLElement.h"
+
 namespace Swift {
 
 MUCPayloadSerializer::MUCPayloadSerializer() : GenericPayloadSerializer<MUCPayload>() {
 }
 
-String MUCPayloadSerializer::serializePayload(boost::shared_ptr<MUCPayload>)  const {
-	String result("<x xmlns='http://jabber.org/protocol/muc'/>");
-	return result;
+String MUCPayloadSerializer::serializePayload(boost::shared_ptr<MUCPayload> payload)  const {
+	XMLElement mucElement("x", "http://jabber.org/protocol/muc");
+	return mucElement.serialize();
 }
 
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h
index b015980..cd7f107 100644
--- a/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h
@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_MUCPayloadSerializer_H
-#define SWIFTEN_MUCPayloadSerializer_H
+#pragma once
 
 #include "Swiften/Serializer/GenericPayloadSerializer.h"
 #include "Swiften/Elements/MUCPayload.h"
@@ -14,9 +13,7 @@ namespace Swift {
 	class MUCPayloadSerializer : public GenericPayloadSerializer<MUCPayload> {
 		public:
 			MUCPayloadSerializer();
-
 			virtual String serializePayload(boost::shared_ptr<MUCPayload> version)  const;
 	};
 }
 
-#endif
diff --git a/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp
new file mode 100644
index 0000000..f4732ea
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2010 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h"
+
+#include <sstream>
+
+#include <boost/shared_ptr.hpp>
+
+#include "Swiften/Base/foreach.h"
+#include "Swiften/Serializer/XML/XMLElement.h"
+#include "Swiften/Serializer/XML/XMLTextNode.h"
+
+
+namespace Swift {
+
+MUCUserPayloadSerializer::MUCUserPayloadSerializer() : GenericPayloadSerializer<MUCUserPayload>() {
+}
+
+String MUCUserPayloadSerializer::serializePayload(boost::shared_ptr<MUCUserPayload> payload)  const {
+	XMLElement mucElement("x", "http://jabber.org/protocol/muc");
+	foreach (const MUCUserPayload::StatusCode statusCode, payload->getStatusCodes()) {
+		boost::shared_ptr<XMLElement> statusElement(new XMLElement("status"));
+		std::ostringstream code;
+		code << statusCode.code;
+		statusElement->setAttribute("code", code.str());
+		mucElement.addNode(statusElement);
+	}
+	foreach (const MUCUserPayload::Item item, payload->getItems()) {
+		boost::shared_ptr<XMLElement> itemElement(new XMLElement("item"));
+		itemElement->setAttribute("affiliation", affiliationToString(item.affiliation));
+		itemElement->setAttribute("role", roleToString(item.role));
+		if (item.realJID) {
+			itemElement->setAttribute("jid", item.realJID.get());
+		}
+		if (item.nick) {
+			itemElement->setAttribute("nick", item.nick.get());
+		}
+		mucElement.addNode(itemElement);
+	}
+	return mucElement.serialize();
+}
+
+String MUCUserPayloadSerializer::affiliationToString(MUCOccupant::Affiliation affiliation) const {
+	String result;
+	switch (affiliation) {
+	case MUCOccupant::Owner: result = "owner"; break;
+	case MUCOccupant::Admin: result = "admin"; break;
+	case MUCOccupant::Member: result = "member"; break;
+	case MUCOccupant::Outcast: result = "outcast"; break;
+	case MUCOccupant::NoAffiliation: result = "none"; break;
+	default: assert(false);
+	}
+	return result;
+}
+
+String MUCUserPayloadSerializer::roleToString(MUCOccupant::Role role) const {
+	String result;
+	switch (role) {
+	case MUCOccupant::Moderator: result = "moderator"; break;
+	case MUCOccupant::NoRole: result = "none"; break;
+	case MUCOccupant::Participant: result = "participant"; break;
+	case MUCOccupant::Visitor: result = "visitor"; break;
+	default: assert(false);
+	}
+	return result;
+
+}
+
+
+}
diff --git a/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h
new file mode 100644
index 0000000..bad21c9
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2010 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/Serializer/GenericPayloadSerializer.h"
+#include "Swiften/Elements/MUCUserPayload.h"
+
+namespace Swift {
+	class MUCUserPayloadSerializer : public GenericPayloadSerializer<MUCUserPayload> {
+		public:
+			MUCUserPayloadSerializer();
+			String affiliationToString(MUCOccupant::Affiliation affiliation) const;
+			String roleToString(MUCOccupant::Role role) const;
+
+			virtual String serializePayload(boost::shared_ptr<MUCUserPayload> version)  const;
+	};
+}
+