1 files changed, 24 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index ecb9288..f8f30ff 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -14,18 +14,19 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <Swift/Controllers/Intl.h>
 #include <Swiften/Base/format.h>
 #include <Swiften/Base/String.h>
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Elements/Delay.h>
 #include <Swiften/Elements/MUCInvitationPayload.h>
+#include <Swiften/Elements/MUCUserPayload.h>
 #include <Swiften/Base/foreach.h>
 #include <Swift/Controllers/XMPPEvents/EventController.h>
 #include <Swiften/Disco/EntityCapsProvider.h>
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
 #include <Swift/Controllers/UIInterfaces/ChatWindowFactory.h>
 #include <Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h>
 #include <Swiften/Avatars/AvatarManager.h>
 
 namespace Swift {
@@ -175,18 +176,22 @@ void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> m
 	std::string body = message->getBody();
 	if (message->isError()) {
 		std::string errorMessage = str(format(QT_TRANSLATE_NOOP("", "Couldn't send message: %1%")) % getErrorMessage(message->getPayload<ErrorPayload>()));
 		chatWindow_->addErrorMessage(errorMessage);
 	}
 	else if (messageEvent->getStanza()->getPayload<MUCInvitationPayload>()) {
 		handleMUCInvitation(messageEvent->getStanza());
 		return;
 	}
+	else if (messageEvent->getStanza()->getPayload<MUCUserPayload>() && messageEvent->getStanza()->getPayload<MUCUserPayload>()->getInvite()) {
+		handleMediatedMUCInvitation(messageEvent->getStanza());
+		return;
+	}
 	else {
 		if (!messageEvent->isReadable()) {
 			return;
 		}
 		showChatWindow();
 		JID from = message->getFrom();
 		std::vector<boost::shared_ptr<Delay> > delayPayloads = message->getPayloads<Delay>();
 		for (size_t i = 0; useDelayForLatency_ && i < delayPayloads.size(); i++) {
 			if (!delayPayloads[i]->getFrom()) {
@@ -260,10 +265,29 @@ std::string ChatControllerBase::getErrorMessage(boost::shared_ptr<ErrorPayload>
 	}
 	return defaultMessage;
 }
 
 void ChatControllerBase::handleMUCInvitation(Message::ref message) {
 	MUCInvitationPayload::ref invite = message->getPayload<MUCInvitationPayload>();
 	chatWindow_->addMUCInvitation(invite->getJID(), invite->getReason(), invite->getPassword());
 }
 
+void ChatControllerBase::handleMediatedMUCInvitation(Message::ref message) {
+	MUCUserPayload::Invite invite = *message->getPayload<MUCUserPayload>()->getInvite();
+	JID from;
+	if (invite.from.isValid()) {
+		from = invite.from;
+	}
+	std::string reason;
+	if (!invite.reason.empty()) {
+		reason = invite.reason;
+	}
+	std::string password;
+	if (message->getPayload<MUCUserPayload>()->getPassword()) {
+		password = *message->getPayload<MUCUserPayload>()->getPassword();
+	}
+	chatWindow_->addMUCInvitation(from, reason, password, false);
+}
+
+
+
 }