1 files changed, 17 insertions, 41 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp
index 50746a9..96fba90 100644
--- a/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp
@@ -4,24 +4,26 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h"
+#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"
-
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
+#include <Swiften/Serializer/XML/XMLTextNode.h>
+#include <Swiften/Serializer/XML/XMLRawTextNode.h>
+#include <Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h>
+#include <Swiften/Serializer/PayloadSerializerCollection.h>
 
 namespace Swift {
 
-MUCUserPayloadSerializer::MUCUserPayloadSerializer() : GenericPayloadSerializer<MUCUserPayload>() {
+MUCUserPayloadSerializer::MUCUserPayloadSerializer(PayloadSerializerCollection* serializers) : GenericPayloadSerializer<MUCUserPayload>(), serializers(serializers) {
 }
 
 std::string MUCUserPayloadSerializer::serializePayload(boost::shared_ptr<MUCUserPayload> payload)  const {
-	XMLElement mucElement("x", "http://jabber.org/protocol/muc");
+	XMLElement mucElement("x", "http://jabber.org/protocol/muc#user");
 	foreach (const MUCUserPayload::StatusCode statusCode, payload->getStatusCodes()) {
 		boost::shared_ptr<XMLElement> statusElement(new XMLElement("status"));
 		std::ostringstream code;
@@ -29,46 +31,20 @@ std::string MUCUserPayloadSerializer::serializePayload(boost::shared_ptr<MUCUser
 		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());
+	foreach (const MUCItem& item, payload->getItems()) {
+		mucElement.addNode(MUCItemSerializer::itemToElement(item));
+	}
+	boost::shared_ptr<Payload> childPayload = payload->getPayload();
+	if (childPayload) {
+		PayloadSerializer* serializer = serializers->getPayloadSerializer(childPayload);
+		if (serializer) {
+			mucElement.addNode(boost::shared_ptr<XMLRawTextNode>(new XMLRawTextNode(serializer->serialize(childPayload))));
 		}
-		mucElement.addNode(itemElement);
 	}
 	return mucElement.serialize();
 }
 
-std::string MUCUserPayloadSerializer::affiliationToString(MUCOccupant::Affiliation affiliation) const {
-	std::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;
-}
-
-std::string MUCUserPayloadSerializer::roleToString(MUCOccupant::Role role) const {
-	std::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;
 
-}
 
 
 }