libtransport.git Changeset - 16340590b496

Changeset - 16340590b496

Parent rev.

Child rev.

[Not reviewed]

0 5 0

HanzZ - 14 years ago 2011-08-05 09:30:24
hanzz.k@gmail.com

Answer probe presences

4 files changed with 32 insertions and 1 deletions:

include/transport/rostermanager.h

spectrum/src/sample.cfg

src/rostermanager.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -67,41 +67,43 @@ class RosterManager { @@
 		/// Returns user associated with this roster.
 		/// \return User
 		User *getUser() { return m_user; }
 		/// Called when new Buddy is added to this roster.
 		/// \param buddy newly added Buddy
 		boost::signal<void (Buddy *buddy)> onBuddySet;
 		/// Called when Buddy has been removed from this roster.
 		/// \param buddy removed Buddy
 		boost::signal<void (Buddy *buddy)> onBuddyUnset;
 		boost::signal<void (Buddy *buddy)> onBuddyAdded;
 		boost::signal<void (Buddy *buddy)> onBuddyRemoved;
 		void handleSubscription(Swift::Presence::ref presence);
 		void sendBuddyRosterPush(Buddy *buddy);
 		void sendBuddySubscribePresence(Buddy *buddy);
 		void sendCurrentPresences(const Swift::JID &to);
 		void sendCurrentPresence(const Swift::JID &from, const Swift::JID &to);
 		void sendUnavailablePresences(const Swift::JID &to);
 	private:
 		void setBuddyCallback(Buddy *buddy);
 		void sendRIE();
 		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key);
 		std::map<std::string, Buddy *> m_buddies;
 		Component *m_component;
 		RosterStorage *m_rosterStorage;
 		User *m_user;
 		Swift::Timer::ref m_setBuddyTimer;
 		Swift::Timer::ref m_RIETimer;
 };
+}

spectrum/src/sample.cfg

➞

Show inline comments

 [service]
 jid = localhost
 password = secret
 server = 127.0.0.1
 port = 5222
 server_mode = 1
 backend_host=localhost # < this option doesn't work yet
 backend_port=10001
 admin_username=admin
 admin_password=test
 idle_reconnect_time=10
+#idle_reconnect_time=10
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
 users_per_backend=10
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 #protocol=prpl-msn
 protocol=any
 #protocol=prpl-icq
 [backend]
 default_avatar=catmelonhead.jpg
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
 type = none # or "none" without database backend
 database = test.sql
 prefix=icq

src/rostermanager.cpp

➞

Show inline comments

 		Swift::RosterItemPayload item;
 		item.setJID(buddy->getJID().toBare());
 		item.setName(buddy->getAlias());
 		item.setGroups(buddy->getGroups());
 		item.setSubscription(Swift::RosterItemPayload::Both);
 		payload->addItem(item);
+	}
 	return payload;
+}
 void RosterManager::sendCurrentPresences(const Swift::JID &to) {
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
 		if (presence) {
 			presence->setTo(to);
 			m_component->getStanzaChannel()->sendPresence(presence);
+		}
+	}
+}
 void RosterManager::sendCurrentPresence(const Swift::JID &from, const Swift::JID &to) {
 	Buddy *buddy = getBuddy(Buddy::JIDToLegacyName(from));
 	if (buddy) {
 		Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
 		if (presence) {
 			presence->setTo(to);
 			m_component->getStanzaChannel()->sendPresence(presence);
+		}
+	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(to);
 		response->setFrom(from);
 		response->setType(Swift::Presence::Unavailable);
 		m_component->getStanzaChannel()->sendPresence(response);
+	}
+}
 void RosterManager::sendUnavailablePresences(const Swift::JID &to) {
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
 		if (presence) {
 			presence->setTo(to);
 			presence->setType(Swift::Presence::Unavailable);
 			m_component->getStanzaChannel()->sendPresence(presence);
+		}
+	}
+}
+}

src/usermanager.cpp

➞

Show inline comments

 	user->getConversationManager()->handleMessageReceived(message);
+}
 void UserManager::handleGeneralPresenceReceived(Swift::Presence::ref presence) {
 	switch(presence->getType()) {
 		case Swift::Presence::Subscribe:
 		case Swift::Presence::Subscribed:
 		case Swift::Presence::Unsubscribe:
 		case Swift::Presence::Unsubscribed:
 			handleSubscription(presence);
 			break;
 		case Swift::Presence::Available:
 		case Swift::Presence::Unavailable:
 			break;
 		case Swift::Presence::Probe:
 			handleProbePresence(presence);
 			break;
 		default:
 			break;
 	};
+}
 void UserManager::handleProbePresence(Swift::Presence::ref presence) {
 	User *user = getUser(presence->getFrom().toBare().toString());
  	if (user) {
  		user->getRosterManager()->sendCurrentPresence(presence->getTo(), presence->getFrom());
+ 	}
  	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setFrom(presence->getTo());
 		response->setTo(presence->getFrom());
 		response->setType(Swift::Presence::Unavailable);
 		m_component->getStanzaChannel()->sendPresence(response);
+	}
+}
 void UserManager::handleSubscription(Swift::Presence::ref presence) {
 	// answer to subscibe for transport itself
 	if (presence->getType() == Swift::Presence::Subscribe && presence->getTo().getNode().empty()) {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setFrom(presence->getTo());
 		response->setTo(presence->getFrom());
 		response->setType(Swift::Presence::Subscribed);
 		m_component->getStanzaChannel()->sendPresence(response);
 // 		response = Swift::Presence::create();
 // 		response->setFrom(presence->getTo());
 // 		response->setTo(presence->getFrom());
 // 		response->setType(Swift::Presence::Subscribe);
 // 		m_component->getStanzaChannel()->sendPresence(response);
 		return;
+	}
 	User *user = getUser(presence->getFrom().toBare().toString());
  	if (user) {
  		user->handleSubscription(presence);
+ 	}

0 comments (0 inline, 0 general)