2 files changed, 37 insertions, 0 deletions
diff --git a/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.cpp b/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.cpp
index 2da8b35..d206010 100644
--- a/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.cpp
+++ b/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.cpp
@@ -16,18 +16,37 @@
 
 namespace Swift {
 
 void MUCUserPayloadParser::handleTree(ParserElement::ref root) {
 	foreach (ParserElement::ref child, root->getAllChildren()) {
 		if (child->getName() == "item" && child->getNamespace() == root->getNamespace()) {
 			MUCItem item = MUCItemParser::itemFromTree(child);
 			getPayloadInternal()->addItem(item);
 		}
+		else if (child->getName() == "password" && child->getNamespace() == root->getNamespace()) {
+			getPayloadInternal()->setPassword(child->getText());
+		}
+		else if (child->getName() == "invite" && child->getNamespace() == root->getNamespace()) {
+			MUCUserPayload::Invite invite;
+			std::string to = child->getAttributes().getAttribute("to");
+			if (!to.empty()) {
+				invite.to = to;
+			}
+			std::string from = child->getAttributes().getAttribute("from");
+			if (!from.empty()) {
+				invite.from = from;
+			}
+			ParserElement::ref reason = child->getChild("reason", root->getNamespace());
+			if (reason) {
+				invite.reason = reason->getText();
+			}
+			getPayloadInternal()->setInvite(invite);
+		}
 		else if (child->getName() == "status" && child->getNamespace() == root->getNamespace()) {
 			MUCUserPayload::StatusCode status;
 			try {
 				status.code = boost::lexical_cast<int>(child->getAttributes().getAttribute("code").c_str());
 				getPayloadInternal()->addStatusCode(status);
 			} catch (boost::bad_lexical_cast&) {
 			}
 		}
 		else {
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp
index 45862e2..40d7358 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp
@@ -14,18 +14,19 @@
 
 using namespace Swift;
 
 class MUCUserPayloadParserTest : public CppUnit::TestFixture
 {
 		CPPUNIT_TEST_SUITE(MUCUserPayloadParserTest);
 		CPPUNIT_TEST(testParseEmpty);
 		CPPUNIT_TEST(testParse);
 		CPPUNIT_TEST(testParseDestroy);
+		CPPUNIT_TEST(testParseInvite);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		MUCUserPayloadParserTest() {}
 
 		void testParse() {
 			PayloadsParserTester parser;
 
 			CPPUNIT_ASSERT(parser.parse("<x xmlns=\"http://jabber.org/protocol/muc#user\"><status code='110'/><item affiliation=\"owner\" role=\"visitor\"><actor jid=\"kev@tester.lit\"/><reason>malice</reason></item><status code='210'/></x>"));
@@ -65,12 +66,29 @@ class MUCUserPayloadParserTest : public CppUnit::TestFixture
 			CPPUNIT_ASSERT(parser.parse("<x xmlns=\"http://jabber.org/protocol/muc#user\"><destroy jid='alice@wonderland.lit'><reason>bert</reason></destroy></x>"));
 
 			MUCUserPayload::ref payload = boost::dynamic_pointer_cast<MUCUserPayload>(parser.getPayload());
 			CPPUNIT_ASSERT(payload);
 			MUCDestroyPayload::ref destroy = boost::dynamic_pointer_cast<MUCDestroyPayload>(payload->getPayload());
 			CPPUNIT_ASSERT(destroy);
 			CPPUNIT_ASSERT_EQUAL(std::string("bert"), destroy->getReason());
 			CPPUNIT_ASSERT_EQUAL(JID("alice@wonderland.lit"), destroy->getNewVenue());
 		}
+
+		void testParseInvite() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse("<x xmlns=\"http://jabber.org/protocol/muc#user\"><invite from='crone1@shakespeare.lit/desktop' to='alice@wonderland.lit/xxx'>      <reason>Hey Hecate, this is the place for all good witches!</reason>    </invite>    <password>cauldronburn</password></x>"));
+
+			MUCUserPayload::ref payload = boost::dynamic_pointer_cast<MUCUserPayload>(parser.getPayload());
+			CPPUNIT_ASSERT(payload);
+			CPPUNIT_ASSERT(payload->getInvite());
+			CPPUNIT_ASSERT(payload->getPassword());
+			CPPUNIT_ASSERT_EQUAL(std::string("cauldronburn"), *payload->getPassword());
+			MUCUserPayload::Invite invite = *payload->getInvite();
+			CPPUNIT_ASSERT_EQUAL(std::string("Hey Hecate, this is the place for all good witches!"), invite.reason);
+			CPPUNIT_ASSERT_EQUAL(JID("crone1@shakespeare.lit/desktop"), invite.from);
+			CPPUNIT_ASSERT_EQUAL(JID("alice@wonderland.lit/xxx"), invite.to);
+		}
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(MUCUserPayloadParserTest);