2 files changed, 24 insertions, 2 deletions
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp
index 1ade7e3..4b3960f 100644
--- a/Swiften/MUC/MUC.cpp
+++ b/Swiften/MUC/MUC.cpp
@@ -11,18 +11,19 @@
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Presence/DirectedPresenceSender.h>
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Queries/IQRouter.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/IQ.h>
 #include <Swiften/Elements/MUCUserPayload.h>
+#include <Swiften/Elements/MUCAdminPayload.h>
 #include <Swiften/Elements/MUCPayload.h>
 #include <Swiften/MUC/MUCRegistry.h>
 #include <Swiften/Queries/GenericRequest.h>
 
 namespace Swift {
 
 typedef std::pair<std::string, MUCOccupant> StringMUCOccupantPair;
 
 MUC::MUC(StanzaChannel* stanzaChannel, IQRouter* iqRouter, DirectedPresenceSender* presenceSender, const JID &muc, MUCRegistry* mucRegistry) : ownMUCJID(muc), stanzaChannel(stanzaChannel), iqRouter_(iqRouter), presenceSender(presenceSender), mucRegistry(mucRegistry) {
@@ -115,20 +116,20 @@ void MUC::handleIncomingPresence(Presence::ref presence) {
 
 	std::string nick = presence->getFrom().getResource();
 	if (nick.empty()) {
 		return;
 	}
 	MUCOccupant::Role role(MUCOccupant::NoRole);
 	MUCOccupant::Affiliation affiliation(MUCOccupant::NoAffiliation);
 	boost::optional<JID> realJID;
 	if (mucPayload && mucPayload->getItems().size() > 0) {
-		role = mucPayload->getItems()[0].role;
-		affiliation = mucPayload->getItems()[0].affiliation;
+		role = mucPayload->getItems()[0].role ? mucPayload->getItems()[0].role.get() : MUCOccupant::NoRole;
+		affiliation = mucPayload->getItems()[0].affiliation ? mucPayload->getItems()[0].affiliation.get() : MUCOccupant::NoAffiliation;
 		realJID = mucPayload->getItems()[0].realJID;
 	}
 
 	//100 is non-anonymous
 	//TODO: 100 may also be specified in a <message/>
 	//170 is room logging to http
 	//TODO: Nick changes
 	if (presence->getType() == Presence::Unavailable) {
 		if (presence->getFrom() == ownMUCJID) {
@@ -211,18 +212,35 @@ void MUC::handleCreationConfigResponse(MUCOwnerPayload::ref /*unused*/, ErrorPay
 
 bool MUC::hasOccupant(const std::string& nick) {
 	return occupants.find(nick) != occupants.end();
 }
 
 MUCOccupant MUC::getOccupant(const std::string& nick) {
 	return occupants.find(nick)->second;
 }
 
+void MUC::kickUser(const JID& jid) {
+	MUCAdminPayload::ref mucPayload = boost::make_shared<MUCAdminPayload>();
+	MUCItem item;
+	item.role = MUCOccupant::NoRole;
+	item.nick = jid.getResource();
+	mucPayload->addItem(item);
+	GenericRequest<MUCAdminPayload>* request = new GenericRequest<MUCAdminPayload>(IQ::Set, getJID(), mucPayload, iqRouter_);
+	request->onResponse.connect(boost::bind(&MUC::handleKickResponse, this, _1, _2, jid));
+	request->send();
+}
+
+void MUC::handleKickResponse(MUCAdminPayload::ref /*unused*/, ErrorPayload::ref error, const JID& jid) {
+	if (error) {
+		onKickFailed(error, jid);
+	}
+}
+
 //FIXME: Recognise Topic changes
 
 //TODO: Invites(direct/mediated)
 
 //TODO: requesting membership
 
 //TODO: get member list
 
 //TODO: request voice
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index 828a36f..41dbc4a 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -7,18 +7,19 @@
 #pragma once
 
 #include <Swiften/JID/JID.h>
 #include <string>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Elements/MUCOccupant.h>
 #include <Swiften/MUC/MUCRegistry.h>
 #include <Swiften/Elements/MUCOwnerPayload.h>
+#include <Swiften/Elements/MUCAdminPayload.h>
 
 #include <boost/shared_ptr.hpp>
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/signals/connection.hpp>
 
 #include <map>
 
 namespace Swift {
 	class StanzaChannel;
@@ -48,21 +49,23 @@ namespace Swift {
 			/*void queryRoomItems(); */
 			std::string getCurrentNick();
 			void part();
 			void handleIncomingMessage(Message::ref message);
 			/** Expose public so it can be called when e.g. user goes offline */
 			void handleUserLeft(LeavingType);
 			/** Get occupant information*/
 			MUCOccupant getOccupant(const std::string& nick);
 			bool hasOccupant(const std::string& nick);
+			void kickUser(const JID& jid);
 		public:
 			boost::signal<void (const std::string& /*nick*/)> onJoinComplete;
 			boost::signal<void (ErrorPayload::ref)> onJoinFailed;
+			boost::signal<void (ErrorPayload::ref, const JID&)> onKickFailed;
 			boost::signal<void (Presence::ref)> onOccupantPresenceChange;
 			boost::signal<void (const std::string&, const MUCOccupant& /*now*/, const MUCOccupant::Role& /*old*/)> onOccupantRoleChanged;
 			boost::signal<void (const std::string&, const MUCOccupant::Affiliation& /*new*/, const MUCOccupant::Affiliation& /*old*/)> onOccupantAffiliationChanged;
 			boost::signal<void (const MUCOccupant&)> onOccupantJoined;
 			boost::signal<void (const MUCOccupant&, LeavingType, const std::string& /*reason*/)> onOccupantLeft;
 			/* boost::signal<void (const MUCInfo&)> onInfoResult; */
 			/* boost::signal<void (const blah&)> onItemsResult; */
 			
 
@@ -73,18 +76,19 @@ namespace Swift {
 
 			const std::string& getOwnNick() const {
 				return ownMUCJID.getResource();
 			}
 
 		private:
 			void handleIncomingPresence(Presence::ref presence);
 			void internalJoin(const std::string& nick);
 			void handleCreationConfigResponse(MUCOwnerPayload::ref, ErrorPayload::ref);
+			void handleKickResponse(MUCAdminPayload::ref, ErrorPayload::ref, const JID&);
 
 		private:
 			JID ownMUCJID;
 			StanzaChannel* stanzaChannel;
 			IQRouter* iqRouter_;
 			DirectedPresenceSender* presenceSender;
 			MUCRegistry* mucRegistry;
 			std::map<std::string, MUCOccupant> occupants;
 			bool joinSucceeded_;