19 files changed, 378 insertions, 129 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 45eeeff..7dbcb70 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -10,8 +10,10 @@
 #include "Swiften/Roster/XMPPRosterImpl.h"
 #include "Swiften/Roster/XMPPRosterController.h"
 #include "Swiften/Presence/PresenceOracle.h"
-#include "Swiften/Presence/PresenceSender.h"
+#include "Swiften/Presence/StanzaChannelPresenceSender.h"
+#include "Swiften/Presence/DirectedPresenceSender.h"
 #include "Swiften/MUC/MUCRegistry.h"
+#include "Swiften/MUC/MUCManager.h"
 #include "Swiften/Client/MemoryStorages.h"
 #include "Swiften/VCards/VCardManager.h"
 #include "Swiften/VCards/VCardManager.h"
@@ -19,6 +21,7 @@
 #include "Swiften/Disco/CapsManager.h"
 #include "Swiften/Disco/EntityCapsManager.h"
 #include "Swiften/Client/NickResolver.h"
+#include "Swiften/Presence/SubscriptionManager.h"
 
 namespace Swift {
 
@@ -31,13 +34,16 @@ Client::Client(EventLoop* eventLoop, const JID& jid, const String& password, Sto
 	roster = new XMPPRosterImpl();
 	rosterController = new XMPPRosterController(getIQRouter(), roster);
 
+	subscriptionManager = new SubscriptionManager(getStanzaChannel());
+
 	presenceOracle = new PresenceOracle(getStanzaChannel());
 	presenceOracle->onPresenceChange.connect(boost::ref(onPresenceChange));
-	presenceOracle->onPresenceSubscriptionRequest.connect(boost::ref(onPresenceSubscriptionRequest));
 
-	presenceSender = new PresenceSender(getStanzaChannel());
+	stanzaChannelPresenceSender = new StanzaChannelPresenceSender(getStanzaChannel());
+	directedPresenceSender = new DirectedPresenceSender(stanzaChannelPresenceSender);
 
 	mucRegistry = new MUCRegistry();
+	mucManager = new MUCManager(getStanzaChannel(), getIQRouter(), directedPresenceSender, mucRegistry);
 
 	vcardManager = new VCardManager(jid, getIQRouter(), getStorages()->getVCardStorage());
 	avatarManager = new AvatarManagerImpl(vcardManager, getStanzaChannel(), getStorages()->getAvatarStorage(), mucRegistry);
@@ -55,11 +61,14 @@ Client::~Client() {
 	delete avatarManager;
 	delete vcardManager;
 
+	delete mucManager;
 	delete mucRegistry;
 
-	delete presenceSender;
+	delete directedPresenceSender;
+	delete stanzaChannelPresenceSender;
 
 	delete presenceOracle;
+	delete subscriptionManager;
 	delete rosterController;
 	delete roster;
 
@@ -81,7 +90,6 @@ void Client::requestRoster() {
 	rosterController->requestRoster();
 }
 
-
 Presence::ref Client::getLastPresence(const JID& jid) const {
 	return presenceOracle->getLastPresence(jid);
 }
@@ -97,5 +105,8 @@ Storages* Client::getStorages() const {
 	return memoryStorages;
 }
 
+PresenceSender* Client::getPresenceSender() const {
+	return directedPresenceSender;
+}
 
 }
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 7e11df9..adfd549 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -12,9 +12,12 @@ namespace Swift {
 	class SoftwareVersionResponder;
 	class XMPPRoster;
 	class XMPPRosterImpl;
+	class MUCManager;
 	class XMPPRosterController;
 	class PresenceOracle;
 	class PresenceSender;
+	class DirectedPresenceSender;
+	class StanzaChannelPresenceSender;
 	class MUCRegistry;
 	class Storages;
 	class MemoryStorages;
@@ -23,6 +26,7 @@ namespace Swift {
 	class CapsManager;
 	class EntityCapsManager;
 	class NickResolver;
+	class SubscriptionManager;
 
 	/**
 	 * Provides the core functionality for writing XMPP client software.
@@ -88,8 +92,10 @@ namespace Swift {
 				return presenceOracle;
 			}
 
-			PresenceSender* getPresenceSender() const {
-				return presenceSender;
+			PresenceSender* getPresenceSender() const;
+
+			MUCManager* getMUCManager() const {
+				return mucManager;
 			}
 
 			MUCRegistry* getMUCRegistry() const {
@@ -112,15 +118,17 @@ namespace Swift {
 				return nickResolver;
 			}
 
+			SubscriptionManager* getSubscriptionManager() const {
+				return subscriptionManager;
+			}
+
 		public:
 			/**
 			 * This signal is emitted when a JID changes presence.
 			 */
 			boost::signal<void (Presence::ref)> onPresenceChange;
 
-			/**
-			 * This signal is emitted when a presence subscription request is received.
-			 */
+
 			boost::signal<void (const JID&, const String&)> onPresenceSubscriptionRequest;
 
 		private:
@@ -133,12 +141,15 @@ namespace Swift {
 			XMPPRosterImpl* roster;
 			XMPPRosterController* rosterController;
 			PresenceOracle* presenceOracle;
-			PresenceSender* presenceSender;
+			DirectedPresenceSender* directedPresenceSender;
+			StanzaChannelPresenceSender* stanzaChannelPresenceSender;
 			MUCRegistry* mucRegistry;
 			VCardManager* vcardManager;
 			AvatarManager* avatarManager;
 			CapsManager* capsManager;
 			EntityCapsManager* entityCapsManager;
 			NickResolver* nickResolver;
+			SubscriptionManager* subscriptionManager;
+			MUCManager* mucManager;
 	};
 }
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp
index cfd468c..9f7c500 100644
--- a/Swiften/MUC/MUC.cpp
+++ b/Swiften/MUC/MUC.cpp
@@ -9,7 +9,7 @@
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "Swiften/Presence/PresenceSender.h"
+#include "Swiften/Presence/DirectedPresenceSender.h"
 #include "Swiften/Client/StanzaChannel.h"
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/Form.h"
@@ -17,13 +17,15 @@
 #include "Swiften/Elements/MUCUserPayload.h"
 #include "Swiften/Elements/MUCOwnerPayload.h"
 #include "Swiften/Elements/MUCPayload.h"
+#include "Swiften/MUC/MUCRegistry.h"
 
 namespace Swift {
 
 typedef std::pair<String, MUCOccupant> StringMUCOccupantPair;
 
-MUC::MUC(StanzaChannel* stanzaChannel, IQRouter* iqRouter, PresenceSender* presenceSender, const JID &muc) : ownMUCJID(muc), stanzaChannel(stanzaChannel), iqRouter_(iqRouter), presenceSender(presenceSender), muc_(muc) {
+MUC::MUC(StanzaChannel* stanzaChannel, IQRouter* iqRouter, DirectedPresenceSender* presenceSender, const JID &muc, MUCRegistry* mucRegistry) : ownMUCJID(muc), stanzaChannel(stanzaChannel), iqRouter_(iqRouter), presenceSender(presenceSender), mucRegistry(mucRegistry) {
 	scopedConnection_ = stanzaChannel->onPresenceReceived.connect(boost::bind(&MUC::handleIncomingPresence, this, _1));
+	mucRegistry->addMUC(getJID());
 }
 
 //FIXME: discover reserved nickname
@@ -57,6 +59,7 @@ void MUC::joinWithContextSince(const String &nick) {
 
 void MUC::part() {
 	presenceSender->removeDirectedPresenceReceiver(ownMUCJID);
+	mucRegistry->removeMUC(getJID());
 }
 
 void MUC::handleUserLeft(LeavingType type) {
@@ -157,7 +160,7 @@ void MUC::handleIncomingPresence(boost::shared_ptr<Presence> presence) {
 				/* Currently deal with this by making an instant room */
 				boost::shared_ptr<MUCOwnerPayload> mucPayload(new MUCOwnerPayload());
 				mucPayload->setPayload(boost::shared_ptr<Payload>(new Form(Form::SubmitType)));
-				boost::shared_ptr<IQ> iq(IQ::createRequest(IQ::Set, muc_, iqRouter_->getNewIQID(), mucPayload));
+				boost::shared_ptr<IQ> iq(IQ::createRequest(IQ::Set, getJID(), iqRouter_->getNewIQID(), mucPayload));
 				iqRouter_->sendIQ(iq);
 			}
 		}
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index ea20ac4..29dbbe1 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -11,6 +11,7 @@
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/MUC/MUCOccupant.h"
+#include "Swiften/MUC/MUCRegistry.h"
 
 #include <boost/shared_ptr.hpp>
 #include "Swiften/Base/boost_bsignals.h"
@@ -21,15 +22,24 @@
 namespace Swift {
 	class StanzaChannel;
 	class IQRouter;
-	class PresenceSender;
+	class DirectedPresenceSender;
 
 	class MUC {
 		public:
+			typedef boost::shared_ptr<MUC> ref;
+
 			enum JoinResult { JoinSucceeded, JoinFailed };
-			enum LeavingType { Part, Disconnect };			
+			enum LeavingType { Part, Disconnect };
 
 		public:
-			MUC(StanzaChannel* stanzaChannel, IQRouter* iqRouter, PresenceSender* presenceSender, const JID &muc);
+			MUC(StanzaChannel* stanzaChannel, IQRouter* iqRouter, DirectedPresenceSender* presenceSender, const JID &muc, MUCRegistry* mucRegistry);
+
+			/**
+			 * Returns the (bare) JID of the MUC.
+			 */
+			JID getJID() const {
+				return ownMUCJID.toBare();
+			}
 
 			void joinAs(const String &nick);
 			void joinWithContextSince(const String &nick);
@@ -70,8 +80,8 @@ namespace Swift {
 			JID ownMUCJID;
 			StanzaChannel* stanzaChannel;
 			IQRouter* iqRouter_;
-			PresenceSender* presenceSender;
-			JID muc_;
+			DirectedPresenceSender* presenceSender;
+			MUCRegistry* mucRegistry;
 			std::map<String, MUCOccupant> occupants;
 			bool joinComplete_;
 			boost::bsignals::scoped_connection scopedConnection_;
diff --git a/Swiften/MUC/MUCManager.cpp b/Swiften/MUC/MUCManager.cpp
new file mode 100644
index 0000000..8950029
--- /dev/null
+++ b/Swiften/MUC/MUCManager.cpp
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Swiften/MUC/MUCManager.h"
+
+namespace Swift {
+
+MUCManager::MUCManager(StanzaChannel* stanzaChannel, IQRouter* iqRouter, DirectedPresenceSender* presenceSender, MUCRegistry* mucRegistry) : stanzaChannel(stanzaChannel), iqRouter(iqRouter), presenceSender(presenceSender), mucRegistry(mucRegistry) {
+}
+
+MUC::ref MUCManager::createMUC(const JID& jid) {
+	return MUC::ref(new MUC(stanzaChannel, iqRouter, presenceSender, jid, mucRegistry));
+}
+
+}
diff --git a/Swiften/MUC/MUCManager.h b/Swiften/MUC/MUCManager.h
new file mode 100644
index 0000000..0efdf9a
--- /dev/null
+++ b/Swiften/MUC/MUCManager.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/MUC/MUC.h"
+
+namespace Swift {
+	class IQRouter;
+	class StanzaChannel;
+	class DirectedPresenceSender;
+	class MUCRegistry;
+
+	class MUCManager {
+		public:
+			MUCManager(StanzaChannel* stanzaChannel, IQRouter* iqRouter, DirectedPresenceSender* presenceSender, MUCRegistry* mucRegistry);
+
+			MUC::ref createMUC(const JID&);
+
+		private:
+			StanzaChannel* stanzaChannel;
+			IQRouter* iqRouter;
+			DirectedPresenceSender* presenceSender;
+			MUCRegistry* mucRegistry;
+	};
+}
diff --git a/Swiften/Presence/DirectedPresenceSender.cpp b/Swiften/Presence/DirectedPresenceSender.cpp
new file mode 100644
index 0000000..aade6cf
--- /dev/null
+++ b/Swiften/Presence/DirectedPresenceSender.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Swiften/Presence/DirectedPresenceSender.h"
+#include "Swiften/Base/foreach.h"
+
+namespace Swift {
+
+DirectedPresenceSender::DirectedPresenceSender(PresenceSender* sender) : sender(sender) {
+}
+
+void DirectedPresenceSender::sendPresence(boost::shared_ptr<Presence> presence) {
+	if (!sender->isAvailable()) {
+		return;
+	}
+
+	sender->sendPresence(presence);
+
+	if (!presence->getTo().isValid()) {
+		boost::shared_ptr<Presence> presenceCopy(new Presence(*presence));
+		foreach(const JID& jid, directedPresenceReceivers) {
+			presenceCopy->setTo(jid);
+			sender->sendPresence(presenceCopy);
+		}
+
+		lastSentUndirectedPresence = presence;
+	}
+}
+
+/**
+ * Gets either the last broadcast presence, or an empty stanza if none has been sent.
+ */
+boost::shared_ptr<Presence> DirectedPresenceSender::getLastSentUndirectedPresence() {
+	boost::shared_ptr<Presence> presenceCopy(lastSentUndirectedPresence ? new Presence(*lastSentUndirectedPresence) : new Presence());
+	return presenceCopy;
+}
+
+void DirectedPresenceSender::addDirectedPresenceReceiver(const JID& jid) {
+	directedPresenceReceivers.insert(jid);
+	if (sender->isAvailable()) {
+		if (lastSentUndirectedPresence && lastSentUndirectedPresence->getType() == Presence::Available) {
+			boost::shared_ptr<Presence> presenceCopy(new Presence(*lastSentUndirectedPresence));
+			presenceCopy->setTo(jid);
+			sender->sendPresence(presenceCopy);
+		}
+	}
+}
+
+void DirectedPresenceSender::removeDirectedPresenceReceiver(const JID& jid) {
+	directedPresenceReceivers.erase(jid);
+	if (sender->isAvailable()) {
+		boost::shared_ptr<Presence> presence(new Presence());
+		presence->setType(Presence::Unavailable);
+		presence->setTo(jid);
+		sender->sendPresence(presence);
+	}
+}
+
+bool DirectedPresenceSender::isAvailable() const {
+	return sender->isAvailable();
+}
+
+}
diff --git a/Swiften/Presence/DirectedPresenceSender.h b/Swiften/Presence/DirectedPresenceSender.h
new file mode 100644
index 0000000..b63a50e
--- /dev/null
+++ b/Swiften/Presence/DirectedPresenceSender.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <set>
+
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Presence/PresenceSender.h"
+
+namespace Swift {
+	class DirectedPresenceSender : public PresenceSender {
+		public:
+			DirectedPresenceSender(PresenceSender*);
+
+			void addDirectedPresenceReceiver(const JID&);
+			void removeDirectedPresenceReceiver(const JID&);
+
+			void sendPresence(Presence::ref);
+
+			Presence::ref getLastSentUndirectedPresence();
+
+			bool isAvailable() const;
+
+		private:
+			Presence::ref lastSentUndirectedPresence;
+			PresenceSender* sender;
+			std::set<JID> directedPresenceReceivers;
+	};
+}
diff --git a/Swiften/Presence/PresenceOracle.cpp b/Swiften/Presence/PresenceOracle.cpp
index fb4be3f..387ad42 100644
--- a/Swiften/Presence/PresenceOracle.cpp
+++ b/Swiften/Presence/PresenceOracle.cpp
@@ -33,12 +33,11 @@ void PresenceOracle::handleStanzaChannelAvailableChanged(bool available) {
 void PresenceOracle::handleIncomingPresence(Presence::ref presence) {
 	JID bareJID(presence->getFrom().toBare());
 	if (presence->getType() == Presence::Subscribe) {
-		onPresenceSubscriptionRequest(bareJID, presence->getStatus());
-	} else {
+	}
+	else {
 		Presence::ref passedPresence = presence;
 		if (presence->getType() == Presence::Unsubscribe) {
 			/* 3921bis says that we don't follow up with an unavailable, so simulate this ourselves */
-			onPresenceSubscriptionRevoked(bareJID, presence->getStatus());
 			passedPresence = Presence::ref(new Presence());
 			passedPresence->setType(Presence::Unavailable);
 			passedPresence->setFrom(bareJID);
diff --git a/Swiften/Presence/PresenceOracle.h b/Swiften/Presence/PresenceOracle.h
index f30d05d..e846984 100644
--- a/Swiften/Presence/PresenceOracle.h
+++ b/Swiften/Presence/PresenceOracle.h
@@ -25,8 +25,6 @@ class StanzaChannel;
 
 		public:
 			boost::signal<void (Presence::ref)> onPresenceChange;
-			boost::signal<void (const JID&, const String&)> onPresenceSubscriptionRequest;
-			boost::signal<void (const JID&, const String&)> onPresenceSubscriptionRevoked;
 
 		private:
 			void handleIncomingPresence(Presence::ref presence);
diff --git a/Swiften/Presence/PresenceSender.cpp b/Swiften/Presence/PresenceSender.cpp
index 6df02b8..50d75eb 100644
--- a/Swiften/Presence/PresenceSender.cpp
+++ b/Swiften/Presence/PresenceSender.cpp
@@ -5,81 +5,10 @@
  */
 
 #include "Swiften/Presence/PresenceSender.h"
-#include "Swiften/Base/foreach.h"
-#include "Swiften/Client/StanzaChannel.h"
 
 namespace Swift {
 
-PresenceSender::PresenceSender(StanzaChannel* channel) : channel(channel) {
-}
-
-void PresenceSender::sendPresence(boost::shared_ptr<Presence> presence) {
-	if (!channel->isAvailable()) {
-		return;
-	}
-
-	channel->sendPresence(presence);
-
-	if (!presence->getTo().isValid()) {
-		boost::shared_ptr<Presence> presenceCopy(new Presence(*presence));
-		foreach(const JID& jid, directedPresenceReceivers) {
-			presenceCopy->setTo(jid);
-			channel->sendPresence(presenceCopy);
-		}
-
-		lastSentUndirectedPresence = presence;
-	}
-}
-
-/**
- * Gets either the last broadcast presence, or an empty stanza if none has been sent.
- */
-boost::shared_ptr<Presence> PresenceSender::getLastSentUndirectedPresence() {
-	boost::shared_ptr<Presence> presenceCopy(lastSentUndirectedPresence ? new Presence(*lastSentUndirectedPresence) : new Presence());
-	return presenceCopy;
-}
-
-void PresenceSender::addDirectedPresenceReceiver(const JID& jid) {
-	directedPresenceReceivers.insert(jid);
-	if (channel->isAvailable()) {
-		if (lastSentUndirectedPresence && lastSentUndirectedPresence->getType() == Presence::Available) {
-			boost::shared_ptr<Presence> presenceCopy(new Presence(*lastSentUndirectedPresence));
-			presenceCopy->setTo(jid);
-			channel->sendPresence(presenceCopy);
-		}
-	}
-}
-
-void PresenceSender::removeDirectedPresenceReceiver(const JID& jid) {
-	directedPresenceReceivers.erase(jid);
-	if (channel->isAvailable()) {
-		boost::shared_ptr<Presence> presence(new Presence());
-		presence->setType(Presence::Unavailable);
-		presence->setTo(jid);
-		channel->sendPresence(presence);
-	}
-}
-
-void PresenceSender::cancelSubscription(const JID& jid) {
-	boost::shared_ptr<Presence> stanza(new Presence());
-	stanza->setType(Presence::Unsubscribed);
-	stanza->setTo(jid);
-	channel->sendPresence(stanza);
-}
-
-void PresenceSender::confirmSubscription(const JID& jid) {
-	boost::shared_ptr<Presence> stanza(new Presence());
-	stanza->setType(Presence::Subscribed);
-	stanza->setTo(jid);
-	channel->sendPresence(stanza);
-}
-
-
-void PresenceSender::requestSubscription(const JID& jid) {
-	boost::shared_ptr<Presence> stanza(new Presence());
-	stanza->setType(Presence::Subscribe);
-	stanza->setTo(jid);
-	channel->sendPresence(stanza);
+PresenceSender::~PresenceSender() {
 }
 
 }
diff --git a/Swiften/Presence/PresenceSender.h b/Swiften/Presence/PresenceSender.h
index 3336523..5abf2f3 100644
--- a/Swiften/Presence/PresenceSender.h
+++ b/Swiften/Presence/PresenceSender.h
@@ -6,31 +6,15 @@
 
 #pragma once
 
-#include <set>
-
 #include "Swiften/Elements/Presence.h"
 
 namespace Swift {
-	class StanzaChannel;
-
 	class PresenceSender {
 		public:
-			PresenceSender(StanzaChannel*);
-
-			void addDirectedPresenceReceiver(const JID&);
-			void removeDirectedPresenceReceiver(const JID&);
-
-			void sendPresence(boost::shared_ptr<Presence>);
-
-			void cancelSubscription(const JID& jid);
-			void confirmSubscription(const JID& jid);
-			void requestSubscription(const JID& jid);
+			virtual ~PresenceSender();
 
-			boost::shared_ptr<Presence> getLastSentUndirectedPresence();
+			virtual void sendPresence(Presence::ref) = 0;
 
-		private:
-			boost::shared_ptr<Presence> lastSentUndirectedPresence;
-			StanzaChannel* channel;
-			std::set<JID> directedPresenceReceivers;
+			virtual bool isAvailable() const = 0;
 	};
 }
diff --git a/Swiften/Presence/StanzaChannelPresenceSender.cpp b/Swiften/Presence/StanzaChannelPresenceSender.cpp
new file mode 100644
index 0000000..654b7e7
--- /dev/null
+++ b/Swiften/Presence/StanzaChannelPresenceSender.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Swiften/Presence/StanzaChannelPresenceSender.h"
+#include "Swiften/Client/StanzaChannel.h"
+
+namespace Swift {
+
+StanzaChannelPresenceSender::StanzaChannelPresenceSender(StanzaChannel* channel) : channel(channel) {
+}
+
+void StanzaChannelPresenceSender::sendPresence(Presence::ref presence) {
+	channel->sendPresence(presence);
+}
+
+bool StanzaChannelPresenceSender::isAvailable() const {
+	return channel->isAvailable();
+}
+
+}
diff --git a/Swiften/Presence/StanzaChannelPresenceSender.h b/Swiften/Presence/StanzaChannelPresenceSender.h
new file mode 100644
index 0000000..23230ab
--- /dev/null
+++ b/Swiften/Presence/StanzaChannelPresenceSender.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/Presence/PresenceSender.h"
+
+namespace Swift {
+	class StanzaChannel;
+
+	class StanzaChannelPresenceSender : public PresenceSender {
+		public:
+			StanzaChannelPresenceSender(StanzaChannel*);
+
+			void sendPresence(Presence::ref);
+
+			bool isAvailable() const;
+
+		private:
+			StanzaChannel* channel;
+	};
+}
diff --git a/Swiften/Presence/SubscriptionManager.cpp b/Swiften/Presence/SubscriptionManager.cpp
new file mode 100644
index 0000000..12534dc
--- /dev/null
+++ b/Swiften/Presence/SubscriptionManager.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Swiften/Presence/SubscriptionManager.h"
+
+#include <boost/bind.hpp>
+
+#include "Swiften/Base/foreach.h"
+#include "Swiften/Client/StanzaChannel.h"
+
+namespace Swift {
+
+SubscriptionManager::SubscriptionManager(StanzaChannel* channel) : stanzaChannel(channel) {
+	stanzaChannel->onPresenceReceived.connect(boost::bind(&SubscriptionManager::handleIncomingPresence, this, _1));
+}
+
+SubscriptionManager::~SubscriptionManager() {
+	stanzaChannel->onPresenceReceived.disconnect(boost::bind(&SubscriptionManager::handleIncomingPresence, this, _1));
+}
+
+void SubscriptionManager::cancelSubscription(const JID& jid) {
+	Presence::ref stanza(new Presence());
+	stanza->setType(Presence::Unsubscribed);
+	stanza->setTo(jid);
+	stanzaChannel->sendPresence(stanza);
+}
+
+void SubscriptionManager::confirmSubscription(const JID& jid) {
+	Presence::ref stanza(new Presence());
+	stanza->setType(Presence::Subscribed);
+	stanza->setTo(jid);
+	stanzaChannel->sendPresence(stanza);
+}
+
+
+void SubscriptionManager::requestSubscription(const JID& jid) {
+	Presence::ref stanza(new Presence());
+	stanza->setType(Presence::Subscribe);
+	stanza->setTo(jid);
+	stanzaChannel->sendPresence(stanza);
+}
+
+void SubscriptionManager::handleIncomingPresence(Presence::ref presence) {
+	JID bareJID(presence->getFrom().toBare());
+	if (presence->getType() == Presence::Subscribe) {
+		onPresenceSubscriptionRequest(bareJID, presence->getStatus());
+	}
+	else if (presence->getType() == Presence::Unsubscribe) {
+		onPresenceSubscriptionRevoked(bareJID, presence->getStatus());
+	}
+}
+
+
+}
diff --git a/Swiften/Presence/SubscriptionManager.h b/Swiften/Presence/SubscriptionManager.h
new file mode 100644
index 0000000..477a2fd
--- /dev/null
+++ b/Swiften/Presence/SubscriptionManager.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <map>
+
+#include "Swiften/Base/String.h"
+#include "Swiften/JID/JID.h"
+#include "Swiften/Base/boost_bsignals.h"
+#include "Swiften/Elements/Presence.h"
+
+namespace Swift {
+	class StanzaChannel;
+
+	class SubscriptionManager {
+		public:
+			SubscriptionManager(StanzaChannel* stanzaChannel);
+			~SubscriptionManager();
+
+			void cancelSubscription(const JID& jid);
+			void confirmSubscription(const JID& jid);
+			void requestSubscription(const JID& jid);
+
+			/**
+			 * This signal is emitted when a presence subscription request is received.
+			 */
+			boost::signal<void (const JID&, const String&)> onPresenceSubscriptionRequest;
+
+			boost::signal<void (const JID&, const String&)> onPresenceSubscriptionRevoked;
+
+		private:
+			void handleIncomingPresence(Presence::ref presence);
+
+		private:
+			StanzaChannel* stanzaChannel;
+	};
+}
diff --git a/Swiften/Presence/UnitTest/PresenceSenderTest.cpp b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
index 737f317..a60c429 100644
--- a/Swiften/Presence/UnitTest/PresenceSenderTest.cpp
+++ b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
@@ -8,12 +8,13 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include "Swiften/Client/DummyStanzaChannel.h"
-#include "Swiften/Presence/PresenceSender.h"
+#include "Swiften/Presence/DirectedPresenceSender.h"
+#include "Swiften/Presence/StanzaChannelPresenceSender.h"
 
 using namespace Swift;
 
-class PresenceSenderTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(PresenceSenderTest);
+class DirectedPresenceSenderTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(DirectedPresenceSenderTest);
 		CPPUNIT_TEST(testSendPresence);
 		CPPUNIT_TEST(testSendPresence_UndirectedPresenceWithDirectedPresenceReceivers);
 		CPPUNIT_TEST(testSendPresence_DirectedPresenceWithDirectedPresenceReceivers);
@@ -29,14 +30,16 @@ class PresenceSenderTest : public CppUnit::TestFixture {
 			testPresence->setStatus("Foo");
 			secondTestPresence = boost::shared_ptr<Presence>(new Presence());
 			secondTestPresence->setStatus("Bar");
+			stanzaChannelPresenceSender = new StanzaChannelPresenceSender(channel);
 		}
 
 		void tearDown() {
+			delete stanzaChannelPresenceSender;
 			delete channel;
 		}
 
 		void testSendPresence() {
-			std::auto_ptr<PresenceSender> testling(createPresenceSender());
+			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->sendPresence(testPresence);
 
 			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel->sentStanzas.size()));
@@ -45,7 +48,7 @@ class PresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSendPresence_UndirectedPresenceWithDirectedPresenceReceivers() {
-			std::auto_ptr<PresenceSender> testling(createPresenceSender());
+			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->addDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"));
 
 			testling->sendPresence(testPresence);
@@ -59,7 +62,7 @@ class PresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testSendPresence_DirectedPresenceWithDirectedPresenceReceivers() {
-			std::auto_ptr<PresenceSender> testling(createPresenceSender());
+			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->addDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"));
 			channel->sentStanzas.clear();
 
@@ -72,7 +75,7 @@ class PresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testAddDirectedPresenceReceiver() {
-			std::auto_ptr<PresenceSender> testling(createPresenceSender());
+			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->sendPresence(testPresence);
 			channel->sentStanzas.clear();
 
@@ -85,7 +88,7 @@ class PresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testAddDirectedPresenceReceiver_AfterSendingDirectedPresence() {
-			std::auto_ptr<PresenceSender> testling(createPresenceSender());
+			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->sendPresence(testPresence);
 			secondTestPresence->setTo(JID("foo@bar.com"));
 			testling->sendPresence(secondTestPresence);
@@ -100,7 +103,7 @@ class PresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 		void testRemoveDirectedPresenceReceiver() {
-			std::auto_ptr<PresenceSender> testling(createPresenceSender());
+			std::auto_ptr<DirectedPresenceSender> testling(createPresenceSender());
 			testling->addDirectedPresenceReceiver(JID("alice@wonderland.lit/teaparty"));
 			channel->sentStanzas.clear();
 
@@ -113,14 +116,15 @@ class PresenceSenderTest : public CppUnit::TestFixture {
 		}
 
 	private:
-		PresenceSender* createPresenceSender() {
-			return new PresenceSender(channel);
+		DirectedPresenceSender* createPresenceSender() {
+			return new DirectedPresenceSender(stanzaChannelPresenceSender);
 		}
 	
 	private:
 		DummyStanzaChannel* channel;
+		StanzaChannelPresenceSender* stanzaChannelPresenceSender;
 		boost::shared_ptr<Presence> testPresence;
 		boost::shared_ptr<Presence> secondTestPresence;
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION(PresenceSenderTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(DirectedPresenceSenderTest);
diff --git a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
index d3b4b20..aa450a2 100644
--- a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
+++ b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
@@ -11,6 +11,7 @@
 
 #include "Swiften/Presence/PresenceOracle.h"
 #include "Swiften/Client/DummyStanzaChannel.h"
+#include "Swiften/Presence/SubscriptionManager.h"
 
 using namespace Swift;
 
@@ -31,13 +32,15 @@ class PresenceOracleTest : public CppUnit::TestFixture {
 			stanzaChannel_ = new DummyStanzaChannel();
 			oracle_ = new PresenceOracle(stanzaChannel_);
 			oracle_->onPresenceChange.connect(boost::bind(&PresenceOracleTest::handlePresenceChange, this, _1));
-			oracle_->onPresenceSubscriptionRequest.connect(boost::bind(&PresenceOracleTest::handlePresenceSubscriptionRequest, this, _1, _2));
+			subscriptionManager_ = new SubscriptionManager(stanzaChannel_);
+			subscriptionManager_->onPresenceSubscriptionRequest.connect(boost::bind(&PresenceOracleTest::handlePresenceSubscriptionRequest, this, _1, _2));
 			user1 = JID("user1@foo.com/Foo");
 			user1alt = JID("user1@foo.com/Bar");
 			user2 = JID("user2@bar.com/Bar");
 		}
 
 		void tearDown() {
+			delete subscriptionManager_;
 			delete oracle_;
 			delete stanzaChannel_;
 		}
@@ -181,6 +184,7 @@ class PresenceOracleTest : public CppUnit::TestFixture {
 			String reason;
 		};
 		PresenceOracle* oracle_;
+		SubscriptionManager* subscriptionManager_;
 		DummyStanzaChannel* stanzaChannel_;
 		std::vector<Presence::ref> changes;
 		std::vector<SubscriptionRequestInfo> subscriptionRequests;
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 886051f..5790672 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -47,11 +47,15 @@ if env["SCONS_STAGE"] == "build" :
 			"Elements/Stanza.cpp",
 			"Elements/VCard.cpp",
 			"MUC/MUC.cpp",
+			"MUC/MUCManager.cpp",
 			"MUC/MUCOccupant.cpp",
 			"MUC/MUCRegistry.cpp",
 			"MUC/MUCBookmarkManager.cpp",
 			"Presence/PresenceOracle.cpp",
 			"Presence/PresenceSender.cpp",
+			"Presence/DirectedPresenceSender.cpp",
+			"Presence/StanzaChannelPresenceSender.cpp",
+			"Presence/SubscriptionManager.cpp",
 			"Queries/IQChannel.cpp",
 			"Queries/IQHandler.cpp",
 			"Queries/IQRouter.cpp",
@@ -218,7 +222,7 @@ if env["SCONS_STAGE"] == "build" :
 			File("Parser/UnitTest/XMLParserTest.cpp"),
 			File("Parser/UnitTest/XMPPParserTest.cpp"),
 			File("Presence/UnitTest/PresenceOracleTest.cpp"),
-			File("Presence/UnitTest/PresenceSenderTest.cpp"),
+			File("Presence/UnitTest/DirectedPresenceSenderTest.cpp"),
 			File("Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp"),
 			File("Disco/UnitTest/DiscoInfoResponderTest.cpp"),
 			File("Queries/UnitTest/IQRouterTest.cpp"),