Added PresenceSender object.

author: Remko Tronçon <git@el-tramo.be> 2009-11-24 21:56:19 (GMT)
committer: Remko Tronçon <git@el-tramo.be> 2009-11-24 22:31:48 (GMT)
commit: 9b1e36b4fe08f32896e92abdb6fc7e3dad501160 (patch)
tree: 092ba87f84238665b938198af29fc5894c55382a /Swift
parent: 48fc9e9fb0abd42d47a95042837a026730f20f34 (diff)
download: swift-9b1e36b4fe08f32896e92abdb6fc7e3dad501160.zip
swift-9b1e36b4fe08f32896e92abdb6fc7e3dad501160.tar.bz2
4 files changed, 12 insertions, 5 deletions
diff --git a/Swift/Controllers/MUCController.cpp b/Swift/Controllers/MUCController.cpp
index 848f540..da7a9e7 100644
--- a/Swift/Controllers/MUCController.cpp
+++ b/Swift/Controllers/MUCController.cpp
@@ -1,77 +1,78 @@
 #include "Swift/Controllers/MUCController.h"
 
 #include <boost/bind.hpp>
 
 #include "Swiften/Base/foreach.h"
 #include "Swift/Controllers/ChatWindow.h"
 #include "Swift/Controllers/ChatWindowFactory.h"
 #include "Swiften/MUC/MUC.h"
 #include "Swiften/Client/StanzaChannel.h"
 #include "Swiften/Roster/Roster.h"
 #include "Swiften/Roster/SetPresence.h"
 #include "Swiften/Roster/TreeWidgetFactory.h"
 
 namespace Swift {
 	
 /**
  * The controller does not gain ownership of the stanzaChannel, nor the factory.
  */
 MUCController::MUCController (
 		const JID& self,
 		const JID &muc, 
 		const String &nick, 
 		StanzaChannel* stanzaChannel, 
+		PresenceSender* presenceSender,
 		IQRouter* iqRouter, 
 		ChatWindowFactory* chatWindowFactory, 
 		TreeWidgetFactory *treeWidgetFactory,
 		PresenceOracle* presenceOracle,
 		AvatarManager* avatarManager) : 
 			ChatControllerBase(self, stanzaChannel, iqRouter, chatWindowFactory, muc, presenceOracle, avatarManager),
-			muc_(new MUC(stanzaChannel, muc)), 
+			muc_(new MUC(stanzaChannel, presenceSender, muc)), 
 			nick_(nick), 
 			treeWidgetFactory_(treeWidgetFactory) { 
 	roster_ = new Roster(chatWindow_->getTreeWidget(), treeWidgetFactory_);
 	chatWindow_->onClosed.connect(boost::bind(&MUCController::handleWindowClosed, this));
 	muc_->joinAs(nick);
 	muc_->onOccupantJoined.connect(boost::bind(&MUCController::handleOccupantJoined, this, _1));
 	muc_->onOccupantPresenceChange.connect(boost::bind(&MUCController::handleOccupantPresenceChange, this, _1));
 	muc_->onOccupantLeft.connect(boost::bind(&MUCController::handleOccupantLeft, this, _1, _2, _3));
 	chatWindow_->convertToMUC();
 	chatWindow_->show();
 }
 
 MUCController::~MUCController() {
 	delete muc_;
 	delete roster_;
 }
 
 void MUCController::handleWindowClosed() {
 	muc_->part();
 }
 
 void MUCController::handleOccupantJoined(const MUCOccupant& occupant) {
 	roster_->addContact(JID(toJID_.getNode(), toJID_.getDomain(), occupant.getNick()), occupant.getNick(), "Occupants");
 }
 
 void MUCController::handleOccupantLeft(const MUCOccupant& occupant, MUC::LeavingType, const String& /*reason*/) {
 	roster_->removeContact(JID(toJID_.getNode(), toJID_.getDomain(), occupant.getNick()));
 }
 
 void MUCController::handleOccupantPresenceChange(boost::shared_ptr<Presence> presence) {
 	roster_->applyOnItems(SetPresence(presence, JID::WithResource));
 }
 
 bool MUCController::isIncomingMessageFromMe(boost::shared_ptr<Message> message) {
 	JID from = message->getFrom();
 	return nick_ == from.getResource();
 }
 
 String MUCController::senderDisplayNameFromMessage(const JID& from) {
 	return from.getResource();
 }
 
 void MUCController::preSendMessageRequest(boost::shared_ptr<Message> message) {
 	message->setType(Swift::Message::Groupchat);
 }
 
 }
diff --git a/Swift/Controllers/MUCController.h b/Swift/Controllers/MUCController.h
index af4a23a..7ee6e81 100644
--- a/Swift/Controllers/MUCController.h
+++ b/Swift/Controllers/MUCController.h
@@ -1,47 +1,47 @@
 #ifndef SWIFTEN_MUCController_H
 #define SWIFTEN_MUCController_H
 
 #include <boost/shared_ptr.hpp>
 
 #include "Swiften/Base/String.h"
 #include "Swift/Controllers/ChatControllerBase.h"
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/JID/JID.h"
 #include "Swiften/MUC/MUC.h"
 #include "Swiften/MUC/MUCOccupant.h"
 
 namespace Swift {
 	class StanzaChannel;
 	class IQRouter;
 	class ChatWindow;
 	class ChatWindowFactory;
 	class Roster;
 	class TreeWidgetFactory;
 	class AvatarManager;
 
 	class MUCController : public ChatControllerBase {
 		public:
-			MUCController(const JID& self, const JID &muc, const String &nick, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, TreeWidgetFactory *treeWidgetFactory, PresenceOracle* presenceOracle, AvatarManager* avatarManager);
+			MUCController(const JID& self, const JID &muc, const String &nick, StanzaChannel* stanzaChannel, PresenceSender* presenceSender, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, TreeWidgetFactory *treeWidgetFactory, PresenceOracle* presenceOracle, AvatarManager* avatarManager);
 			~MUCController();
 		
 		protected:
 			void preSendMessageRequest(boost::shared_ptr<Message> message);
 			bool isIncomingMessageFromMe(boost::shared_ptr<Message> message);
 			String senderDisplayNameFromMessage(const JID& from);
 
 		private:
 			void handleWindowClosed();
 			void handleOccupantJoined(const MUCOccupant& occupant);
 			void handleOccupantLeft(const MUCOccupant& occupant, MUC::LeavingType type, const String& reason);
 			void handleOccupantPresenceChange(boost::shared_ptr<Presence> presence);
 
 		private:
 			MUC *muc_;
 			String nick_;
 			TreeWidgetFactory *treeWidgetFactory_;
 			Roster *roster_;
 	};
 }
 #endif
 
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index f54e0a2..22d71e5 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -1,308 +1,312 @@
 #include "Swift/Controllers/MainController.h"
 
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 #include <stdlib.h>
 
 #include "Swiften/Application/Application.h"
 #include "Swiften/Application/ApplicationMessageDisplay.h"
 #include "Swift/Controllers/ChatController.h"
 #include "Swift/Controllers/ChatWindowFactory.h"
 #include "Swift/Controllers/EventController.h"
 #include "Swift/Controllers/LoginWindow.h"
 #include "Swift/Controllers/LoginWindowFactory.h"
 #include "Swift/Controllers/MainWindow.h"
 #include "Swift/Controllers/MainWindowFactory.h"
 #include "Swift/Controllers/MUCController.h"
 #include "Swift/Controllers/NickResolver.h"
 #include "Swift/Controllers/ProfileSettingsProvider.h"
 #include "Swift/Controllers/RosterController.h"
 #include "Swift/Controllers/SoundEventController.h"
 #include "Swift/Controllers/SoundPlayer.h"
 #include "Swift/Controllers/SystemTray.h"
 #include "Swift/Controllers/SystemTrayController.h"
 #include "Swift/Controllers/XMPPRosterController.h"
 #include "Swiften/Base/foreach.h"
 #include "Swiften/Base/String.h"
 #include "Swiften/Client/Client.h"
+#include "Swiften/Presence/PresenceSender.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Elements/VCardUpdate.h"
 #include "Swiften/Queries/Responders/SoftwareVersionResponder.h"
 #include "Swiften/Roster/TreeWidgetFactory.h"
 #include "Swiften/Settings/SettingsProvider.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Queries/Responders/DiscoInfoResponder.h"
 #include "Swiften/Disco/CapsInfoGenerator.h"
 #include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
 #include "Swiften/Queries/Requests/GetVCardRequest.h"
 #include "Swiften/Avatars/AvatarFileStorage.h"
 #include "Swiften/Avatars/AvatarManager.h"
 #include "Swiften/StringCodecs/SHA1.h"
 
 namespace {
 	void printIncomingData(const Swift::String& data) {
 		std::cout << "<- " << data << std::endl;
 	}
 
 	void printOutgoingData(const Swift::String& data) {
 		std::cout << "-> " << data << std::endl;
 	}
 }
 
 namespace Swift {
 
 static const String CLIENT_NAME = "Swift";
 static const String CLIENT_VERSION = "0.3";
 static const String CLIENT_NODE = "http://swift.im";
 
 typedef std::pair<JID, ChatController*> JIDChatControllerPair;
 typedef std::pair<JID, MUCController*> JIDMUCControllerPair;
 
 MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory *treeWidgetFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer)
-		: timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), client_(NULL), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), treeWidgetFactory_(treeWidgetFactory), settings_(settings), xmppRosterController_(NULL), rosterController_(NULL), loginWindow_(NULL), clientVersionResponder_(NULL), nickResolver_(NULL), discoResponder_(NULL) {
+		: timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), client_(NULL), presenceSender_(NULL), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), treeWidgetFactory_(treeWidgetFactory), settings_(settings), xmppRosterController_(NULL), rosterController_(NULL), loginWindow_(NULL), clientVersionResponder_(NULL), nickResolver_(NULL), discoResponder_(NULL) {
 	application_ = application;
 	presenceOracle_ = NULL;
 	avatarManager_ = NULL;
 
 	avatarStorage_ = new AvatarFileStorage(application_->getAvatarDir());
 
 	eventController_ = new EventController();
 	eventController_->onEventQueueLengthChange.connect(boost::bind(&MainController::handleEventQueueLengthChange, this, _1));
 	systemTrayController_ = new SystemTrayController(eventController_, systemTray);
 	soundEventController_ = new SoundEventController(eventController_, soundPlayer, settings->getBoolSetting("playSounds", true));
 	loginWindow_ = loginWindowFactory_->createLoginWindow();
 	foreach (String profile, settings->getAvailableProfiles()) {
 		ProfileSettingsProvider* profileSettings = new ProfileSettingsProvider(profile, settings);
 		loginWindow_->addAvailableAccount(profileSettings->getStringSetting("jid"), profileSettings->getStringSetting("pass"), profileSettings->getStringSetting("certificate"));
 		delete profileSettings;
 	}
 	loginWindow_->onLoginRequest.connect(boost::bind(&MainController::handleLoginRequest, this, _1, _2, _3, _4));
 	loginWindow_->onCancelLoginRequest.connect(boost::bind(&MainController::handleCancelLoginRequest, this));
 
 	idleDetector_.setIdleTimeSeconds(600);
 	idleDetector_.onIdleChanged.connect(boost::bind(&MainController::handleInputIdleChanged, this, _1));
 }
 
 MainController::~MainController() {
 	foreach (JIDChatControllerPair controllerPair, chatControllers_) {
 		delete controllerPair.second;
 	}
 	foreach (JIDMUCControllerPair controllerPair, mucControllers_) {
 		delete controllerPair.second;
 	}
 	delete systemTrayController_;
 	delete soundEventController_;
 	delete avatarStorage_;
 	resetClient();
 }
 
 void MainController::resetClient() {
 	serverDiscoInfo_ = boost::shared_ptr<DiscoInfo>();
 	xmppRoster_ = boost::shared_ptr<XMPPRoster>();
 	delete presenceOracle_;
 	presenceOracle_ = NULL;
 	delete nickResolver_;
 	nickResolver_ = NULL;
 	delete avatarManager_;
 	avatarManager_ = NULL;
 	delete rosterController_;
 	rosterController_ = NULL;
 	delete xmppRosterController_;
 	xmppRosterController_ = NULL;
 	delete clientVersionResponder_;
 	clientVersionResponder_ = NULL;
 	delete discoResponder_;
 	discoResponder_ = NULL;
+	delete presenceSender_;
+	presenceSender_ = NULL;
 	delete client_;
 	client_ = NULL;
 	
 }
 
 void MainController::handleConnected() {
 	//FIXME: this freshLogin thing is temporary so I can see what's what before I split into a seperate method.
 	bool freshLogin = rosterController_ == NULL;
 	if (freshLogin) {
 		serverDiscoInfo_ = boost::shared_ptr<DiscoInfo>(new DiscoInfo());
 		xmppRoster_ = boost::shared_ptr<XMPPRoster>(new XMPPRoster());
 		presenceOracle_ = new PresenceOracle(client_);
 
 		lastSentPresence_ = boost::shared_ptr<Presence>();
 
 		client_->onPresenceReceived.connect(boost::bind(&MainController::handleIncomingPresence, this, _1));
 
 		nickResolver_ = new NickResolver(xmppRoster_);
 
 		avatarManager_ = new AvatarManager(client_, client_, avatarStorage_, this);
 		rosterController_ = new RosterController(jid_, xmppRoster_, avatarManager_, mainWindowFactory_, treeWidgetFactory_, nickResolver_);
 		rosterController_->onStartChatRequest.connect(boost::bind(&MainController::handleChatRequest, this, _1));
 		rosterController_->onJoinMUCRequest.connect(boost::bind(&MainController::handleJoinMUCRequest, this, _1, _2));
 		rosterController_->onChangeStatusRequest.connect(boost::bind(&MainController::handleChangeStatusRequest, this, _1, _2));
 		rosterController_->onSignOutRequest.connect(boost::bind(&MainController::signOut, this));
 
 		xmppRosterController_ = new XMPPRosterController(client_, xmppRoster_);
 		xmppRosterController_->requestRoster();
 
 		clientVersionResponder_ = new SoftwareVersionResponder(CLIENT_NAME, CLIENT_VERSION, client_);
 		loginWindow_->morphInto(rosterController_->getWindow());
 
 		DiscoInfo discoInfo;
 		discoInfo.addIdentity(DiscoInfo::Identity(CLIENT_NAME, "client", "pc"));
 		discoInfo.addFeature("urn:xmpp:sec-label:0");
 		capsInfo_ = boost::shared_ptr<CapsInfo>(new CapsInfo(CapsInfoGenerator(CLIENT_NODE).generateCapsInfo(discoInfo)));
 
 		discoResponder_ = new DiscoInfoResponder(client_);
 		discoResponder_->setDiscoInfo(discoInfo);
 		discoResponder_->setDiscoInfo(capsInfo_->getNode() + "#" + capsInfo_->getVersion(), discoInfo);
 		serverDiscoInfo_ = boost::shared_ptr<DiscoInfo>(new DiscoInfo());
 	}
 	
 	boost::shared_ptr<GetDiscoInfoRequest> discoInfoRequest(new GetDiscoInfoRequest(JID(), client_));
 	discoInfoRequest->onResponse.connect(boost::bind(&MainController::handleServerDiscoInfoResponse, this, _1, _2));
 	discoInfoRequest->send();
 
 	boost::shared_ptr<GetVCardRequest> vCardRequest(new GetVCardRequest(JID(), client_));
 	vCardRequest->onResponse.connect(boost::bind(&MainController::handleOwnVCardReceived, this, _1, _2));
 	vCardRequest->send();
 
 	//Send presence last to catch all the incoming presences.
 	boost::shared_ptr<Presence> initialPresence;
 	if (queuedPresence_.get() != NULL) {
 		initialPresence = queuedPresence_;
 	} else {
 		initialPresence = boost::shared_ptr<Presence>(new Presence());
 	}
 	initialPresence->addPayload(capsInfo_);
 	setManagersEnabled(true);
 	sendPresence(initialPresence);
 }
 
 void MainController::handleEventQueueLengthChange(int count) {
 	application_->getApplicationMessageDisplay()->setMessage(count == 0 ? "" : boost::lexical_cast<std::string>(count).c_str());
 }
 
 void MainController::reconnectAfterError() {
 	performLoginFromCachedCredentials();
 	sendPresence(queuedPresence_);
 }
 
 void MainController::handleChangeStatusRequest(StatusShow::Type show, const String &statusText) {
 	boost::shared_ptr<Presence> presence(new Presence());
 	if (show == StatusShow::None) {
 		// FIXME: This is wrong. None doesn't mean unavailable
 		presence->setType(Presence::Unavailable);
 	}
 	else {
 		presence->setShow(show);
 	}
 	presence->setStatus(statusText);
 	if (presence->getType() != Presence::Unavailable && !client_->isAvailable()) {
 		performLoginFromCachedCredentials();
 		queuedPresence_ = presence;
 	} else {
 		sendPresence(presence);
 	}
 }
 
 void MainController::sendPresence(boost::shared_ptr<Presence> presence) {
 	if (!vCardPhotoHash_.isEmpty()) {
 		presence->addPayload(boost::shared_ptr<VCardUpdate>(new VCardUpdate(vCardPhotoHash_)));
 	}
 	presence->addPayload(capsInfo_);
 	lastSentPresence_ = presence;
-	client_->sendPresence(presence);
+	presenceSender_->sendPresence(presence);
 	if (presence->getType() == Presence::Unavailable) {
 		logout();
 	}
 }
 
 void MainController::handleInputIdleChanged(bool idle) {
 	if (!client_ || !client_->isAvailable()) {
 		return;
 	}
 	if (idle) {
 		preIdlePresence_ = lastSentPresence_;
 		boost::shared_ptr<Presence> presence(new Presence());
 		presence->setShow(StatusShow::Away);
 		presence->setStatus("Auto-away");
 		sendPresence(presence);
 	}
 	else {
 		if (client_) {
 			sendPresence(preIdlePresence_);
 		} else {
 			queuedPresence_ = preIdlePresence_;
 		}
 	}
 }
 
 void MainController::handleIncomingPresence(boost::shared_ptr<Presence> presence) {
 	//FIXME: subscribe, subscribed
 	rosterController_->handleIncomingPresence(presence);
 }
 
 void MainController::handleLoginRequest(const String &username, const String &password, const String& certificateFile, bool remember) {
 	loginWindow_->setMessage("");
 	ProfileSettingsProvider* profileSettings = new ProfileSettingsProvider(username, settings_);
 	profileSettings->storeString("jid", username);
 	profileSettings->storeString("certificate", certificateFile);
 	profileSettings->storeString("pass", remember ? password : "");
 	loginWindow_->addAvailableAccount(profileSettings->getStringSetting("jid"), profileSettings->getStringSetting("pass"), profileSettings->getStringSetting("certificate"));
 	delete profileSettings;
 	jid_ = JID(username);
 	password_ = password;
 	certificateFile_ = certificateFile;
 	performLoginFromCachedCredentials();
 }
 
 void MainController::performLoginFromCachedCredentials() {
 	if (!client_) {
 		client_ = new Swift::Client(jid_, password_);
+		presenceSender_ = new PresenceSender(client_);
 		//client_->onDataRead.connect(&printIncomingData);
 		//client_->onDataWritten.connect(&printOutgoingData);
 		if (!certificateFile_.isEmpty()) {
 			client_->setCertificate(certificateFile_);
 		}
 		client_->onError.connect(boost::bind(&MainController::handleError, this, _1));
 		client_->onConnected.connect(boost::bind(&MainController::handleConnected, this));
 		client_->onMessageReceived.connect(boost::bind(&MainController::handleIncomingMessage, this, _1));
 	}
 	client_->connect();
 }
 
 void MainController::handleError(const ClientError& error) {
 	String message;
 	switch(error.getType()) {
 		case ClientError::UnknownError: message = "Unknown Error"; break;
 		case ClientError::DomainNameResolveError: message = "Unable to find server"; break;
 		case ClientError::ConnectionError: message = "Error connecting to server"; break;
 		case ClientError::ConnectionReadError: message = "Error while receiving server data"; break;
 		case ClientError::ConnectionWriteError: message = "Error while sending data to the server"; break;
 		case ClientError::XMLError: message = "Error parsing server data"; break;
 		case ClientError::AuthenticationFailedError: message = "Login/password invalid"; break;
 		case ClientError::ServerVerificationFailedError: message = "Server verification failed"; break;
 		case ClientError::NoSupportedAuthMechanismsError: message = "Authentication mechanisms not supported"; break;
 		case ClientError::UnexpectedElementError: message = "Unexpected response"; break;
 		case ClientError::ResourceBindError: message = "Error binding resource"; break;
 		case ClientError::SessionStartError: message = "Error starting session"; break;
 		case ClientError::TLSError: message = "Encryption error"; break;
 		case ClientError::ClientCertificateLoadError: message = "Error loading certificate (Invalid password?)"; break;
 		case ClientError::ClientCertificateError: message = "Certificate not authorized"; break;
 	}
 	if (!rosterController_) { //hasn't been logged in yet
 		signOut();
 		loginWindow_->setMessage(message);
 	}
 	logout();
 	if (rosterController_) {
 		//reconnectAfterError();
 	}
 }
 
 void MainController::handleCancelLoginRequest() {
 	signOut();
 }
 
 void MainController::signOut() {
 	logout();
 	loginWindow_->loggedOut();
@@ -323,97 +327,97 @@ void MainController::logout() {
 	if (client_ && client_->isAvailable()) {
 		client_->disconnect();
 	}
 	if (rosterController_) {
 		rosterController_->getWindow()->setMyStatusType(StatusShow::None);
 		rosterController_->getWindow()->setMyStatusText("");
 	}
 	setManagersEnabled(false);
 }
 
 void MainController::setManagersEnabled(bool enabled) {
 	foreach (JIDChatControllerPair controllerPair, chatControllers_) {
 		//printf("Setting enabled on %d to %d\n", controllerPair.second, enabled);
 		controllerPair.second->setEnabled(enabled);
 	}
 	foreach (JIDMUCControllerPair controllerPair, mucControllers_) {
 		controllerPair.second->setEnabled(enabled);
 	}
 	if (rosterController_) {
 		rosterController_->setEnabled(enabled);
 	}
 }
 
 void MainController::handleChatRequest(const String &contact) {
 	ChatController* controller = getChatController(JID(contact));
 	controller->showChatWindow();
 	controller->activateChatWindow();
 }
 
 ChatController* MainController::getChatController(const JID &contact) {
 	JID lookupContact(contact);
 	if (chatControllers_.find(lookupContact) == chatControllers_.end()) {
 		lookupContact = JID(contact.toBare());
 	}
 	if (chatControllers_.find(lookupContact) == chatControllers_.end()) {
 		chatControllers_[contact] = new ChatController(jid_, client_, client_, chatWindowFactory_, contact, nickResolver_, presenceOracle_, avatarManager_);
 		chatControllers_[contact]->setAvailableServerFeatures(serverDiscoInfo_);
 		lookupContact = contact;
 	}
 	return chatControllers_[lookupContact];
 }
 
 void MainController::handleChatControllerJIDChanged(const JID& from, const JID& to) {
 	chatControllers_[to] = chatControllers_[from];
 	chatControllers_.erase(from);
 }
 
 void MainController::handleJoinMUCRequest(const JID &muc, const String &nick) {
-	mucControllers_[muc] = new MUCController(jid_, muc, nick, client_, client_, chatWindowFactory_, treeWidgetFactory_, presenceOracle_, avatarManager_);
+	mucControllers_[muc] = new MUCController(jid_, muc, nick, client_, presenceSender_, client_, chatWindowFactory_, treeWidgetFactory_, presenceOracle_, avatarManager_);
 	mucControllers_[muc]->setAvailableServerFeatures(serverDiscoInfo_);
 }
 
 void MainController::handleIncomingMessage(boost::shared_ptr<Message> message) {
 	JID jid = message->getFrom();
 	boost::shared_ptr<MessageEvent> event(new MessageEvent(message));
 
 	// Try to deliver it to a MUC
 	if (message->getType() == Message::Groupchat || message->getType() == Message::Error) {
 		std::map<JID, MUCController*>::iterator i = mucControllers_.find(jid.toBare());
 		if (i != mucControllers_.end()) {
 			i->second->handleIncomingMessage(event);
 			return;
 		}
 		else if (message->getType() == Message::Groupchat) {
 			//FIXME: Error handling - groupchat messages from an unknown muc.
 			return;
 		}
 	}
 	
 	//if not a mucroom
 	eventController_->handleIncomingEvent(event);
 
 	// FIXME: This logic should go into a chat manager
 	if (event->isReadable()) {
 		getChatController(jid)->handleIncomingMessage(event);
 	}
 }
 
 void MainController::handleServerDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, const boost::optional<ErrorPayload>& error) {
 	if (!error) {
 		serverDiscoInfo_ = info;
 		foreach (JIDChatControllerPair pair, chatControllers_) {
 			pair.second->setAvailableServerFeatures(info);
 		}
 		foreach (JIDMUCControllerPair pair, mucControllers_) {
 			pair.second->setAvailableServerFeatures(info);
 		}
 	}
 }
 
 bool MainController::isMUC(const JID& jid) const {
 	return mucControllers_.find(jid.toBare()) != mucControllers_.end();
 }
 
 void MainController::handleOwnVCardReceived(boost::shared_ptr<VCard> vCard, const boost::optional<ErrorPayload>& error) {
 	if (!error && !vCard->getPhoto().isEmpty()) {
 		vCardPhotoHash_ = SHA1::getHexHash(vCard->getPhoto());
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 270b131..78e49a2 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -1,121 +1,123 @@
 #pragma once
 
 #include <boost/signals.hpp>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
 #include "Swiften/Network/BoostIOServiceThread.h"
 #include "Swiften/Network/BoostTimerFactory.h"
 #include "SwifTools/Idle/PlatformIdleQuerier.h"
 #include "SwifTools/Idle/ActualIdleDetector.h"
 #include "Swiften/Base/String.h"
 #include "Swiften/Client/ClientError.h"
 #include "Swiften/JID/JID.h"
 #include "Swiften/Elements/VCard.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Elements/ErrorPayload.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Settings/SettingsProvider.h"
 #include "Swiften/Elements/CapsInfo.h"
 #include "Swiften/MUC/MUCRegistry.h"
 #include "Swiften/Roster/XMPPRoster.h"
 
 namespace Swift {
 	class AvatarStorage;
 	class Application;
 	class Client;
 	class ChatWindowFactory;
 	class ChatController;
 	class EventController;
 	class MainWindowFactory;
 	class MainWindow;
 	class NickResolver;
 	class RosterController;
 	class XMPPRosterController;
+	class PresenceSender;
 	class DiscoInfoResponder;
 	class AvatarManager;
 	class LoginWindow;
 	class EventLoop;
 	class SoftwareVersionResponder;
 	class LoginWindowFactory;
 	class TreeWidgetFactory;
 	class MUCController;
 	class PresenceOracle;
 	class SystemTray;
 	class SystemTrayController;
 	class SoundEventController;
 	class SoundPlayer;
 
 	class MainController : public MUCRegistry {
 		public:
 			MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory* treeWidgetFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer);
 			~MainController();
 
 
 		private:
 			void resetClient();
 
 			void handleConnected();
 			void handleLoginRequest(const String& username, const String& password, const String& certificateFile, bool remember);
 			void handleCancelLoginRequest();
 			void handleChatRequest(const String& contact);
 			void handleJoinMUCRequest(const JID& muc, const String& nick);
 			void handleIncomingPresence(boost::shared_ptr<Presence> presence);
 			void handleChatControllerJIDChanged(const JID& from, const JID& to);
 			void handleIncomingMessage(boost::shared_ptr<Message> message);
 			void handleChangeStatusRequest(StatusShow::Type show, const String &statusText);
 			void handleError(const ClientError& error);
 			void handleServerDiscoInfoResponse(boost::shared_ptr<DiscoInfo>, const boost::optional<ErrorPayload>&);
 			void handleEventQueueLengthChange(int count);
 			void handleOwnVCardReceived(boost::shared_ptr<VCard> vCard, const boost::optional<ErrorPayload>& error);
 			ChatController* getChatController(const JID &contact);
 			void sendPresence(boost::shared_ptr<Presence> presence);
 			void handleInputIdleChanged(bool);
 			void logout();
 			void signOut();
 
 			virtual bool isMUC(const JID& muc) const;
 	
 			void performLoginFromCachedCredentials();
 			void reconnectAfterError();
 			void setManagersEnabled(bool enabled);
 
 			BoostIOServiceThread boostIOServiceThread_;
 			BoostTimerFactory timerFactory_;
 			PlatformIdleQuerier idleQuerier_;
 			ActualIdleDetector idleDetector_;
 			Client* client_;
+			PresenceSender* presenceSender_;
 			ChatWindowFactory* chatWindowFactory_;
 			MainWindowFactory* mainWindowFactory_;
 			LoginWindowFactory* loginWindowFactory_;
 			TreeWidgetFactory* treeWidgetFactory_;
 			SettingsProvider *settings_;
 			Application* application_;
 			AvatarStorage* avatarStorage_;
 			ChatController* chatController_;
 			XMPPRosterController* xmppRosterController_;
 			RosterController* rosterController_;
 			EventController* eventController_;
 			LoginWindow* loginWindow_;
 			SoftwareVersionResponder* clientVersionResponder_;
 			NickResolver* nickResolver_;
 			DiscoInfoResponder* discoResponder_;
 			boost::shared_ptr<CapsInfo> capsInfo_;
 			std::map<JID, MUCController*> mucControllers_;
 			std::map<JID, ChatController*> chatControllers_;
 			boost::shared_ptr<DiscoInfo> serverDiscoInfo_;
 			boost::shared_ptr<XMPPRoster> xmppRoster_;;
 			JID jid_;
 			PresenceOracle* presenceOracle_;
 			SystemTrayController* systemTrayController_;
 			SoundEventController* soundEventController_;
 			AvatarManager* avatarManager_;
 			boost::shared_ptr<Presence> lastSentPresence_;
 			boost::shared_ptr<Presence> preIdlePresence_;
 			String vCardPhotoHash_;
 			boost::shared_ptr<Presence> queuedPresence_;
 			String password_;
 			String certificateFile_;
 	};
 }
author	Remko Tronçon <git@el-tramo.be>	2009-11-24 21:56:19 (GMT)
committer	Remko Tronçon <git@el-tramo.be>	2009-11-24 22:31:48 (GMT)
commit	9b1e36b4fe08f32896e92abdb6fc7e3dad501160 (patch)
tree	092ba87f84238665b938198af29fc5894c55382a /Swift
parent	48fc9e9fb0abd42d47a95042837a026730f20f34 (diff)
download	swift-9b1e36b4fe08f32896e92abdb6fc7e3dad501160.zip swift-9b1e36b4fe08f32896e92abdb6fc7e3dad501160.tar.bz2