libtransport.git Changeset - fb527b576090

Changeset - fb527b576090

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Jan Kaluza - 13 years ago 2012-06-14 08:06:46
hanzz.k@gmail.com

Added NetworkPlugin::handleBuddyRemoved method to let backend remove buddy from XMPP user's roster

6 files changed with 99 insertions and 2 deletions:

include/transport/networkplugin.h

include/transport/networkpluginserver.h

include/transport/rostermanager.h

plugin/cpp/networkplugin.cpp

src/networkpluginserver.cpp

src/rostermanager.cpp

0 comments (0 inline, 0 general)

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -75,6 +75,11 @@ class NetworkPlugin { @@
 			bool blocked = false
 		);
 		/// Call this method when buddy is removed from legacy network contact list.
 		/// \param user XMPP JID of user for which this event occurs. You can get it from NetworkPlugin::handleLoginRequest(). (eg. "user%gmail.com@xmpp.domain.tld")
 		/// \param buddyName Name of legacy network buddy. (eg. "user2@gmail.com")
 		void handleBuddyRemoved(const std::string &user, const std::string &buddyName);
 		/// Call this function when participant in room changed.
 		/// \param user XMPP JID of user for which this event occurs. You can get it from NetworkPlugin::handleLoginRequest(). (eg. "user%gmail.com@xmpp.domain.tld")
 		/// \param nickname Nickname of participant. If participant renamed, this is old name of participant. (eg. "HanzZ")

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -89,6 +89,7 @@ class NetworkPluginServer { @@
 		void handleConnectedPayload(const std::string &payload);
 		void handleDisconnectedPayload(const std::string &payload);
 		void handleBuddyChangedPayload(const std::string &payload);
 		void handleBuddyRemovedPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload, bool subject = false);
 		void handleParticipantChangedPayload(const std::string &payload);
 		void handleRoomChangedPayload(const std::string &payload);

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -69,6 +69,10 @@ class RosterManager { @@
 		/// \param buddy Buddy.
 		void unsetBuddy(Buddy *buddy);
 		/// Removes buddy from this roster, sends proper XML to XMPP side and deletes it.
 		/// \param name Buddy name.
 		void removeBuddy(const std::string &name);
 		Buddy *getBuddy(const std::string &name);
 		void setStorageBackend(StorageBackend *storageBackend);
@@ @@ -107,7 +111,11 @@ class RosterManager { @@
 		void sendBuddyRosterPush(Buddy *buddy);
 		void sendBuddyRosterRemove(Buddy *buddy);
 		void sendBuddySubscribePresence(Buddy *buddy);
 		void sendBuddyUnsubscribePresence(Buddy *buddy);
 		void sendCurrentPresences(const Swift::JID &to);

plugin/cpp/networkplugin.cpp

➞

Show inline comments

 	send(message);
+}
 void NetworkPlugin::handleBuddyRemoved(const std::string &user, const std::string &buddyName) {
 	pbnetwork::Buddy buddy;
 	buddy.set_username(user);
 	buddy.set_buddyname(buddyName);
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_REMOVED);
 	send(message);
+}
 void NetworkPlugin::handleBuddyTyping(const std::string &user, const std::string &buddyName) {
 	pbnetwork::Buddy buddy;
 	buddy.set_username(user);

src/networkpluginserver.cpp

➞

Show inline comments

 	LOG4CXX_INFO(logger, "Listening on host " << CONFIG_STRING(m_config, "service.backend_host") << " port " << CONFIG_STRING(m_config, "service.backend_port"));
 	unsigned long pid = exec_(CONFIG_STRING(m_config, "service.backend"), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
 	LOG4CXX_INFO(logger, "Tried to spawn first backend with pid " << pid);
 	LOG4CXX_INFO(logger, "Backend should now connect to Spectrum2 instance. Spectrum2 won't accept any connection before backend connects");
 #ifndef _WIN32
 	if (!user)
 		return;
 	LOG4CXX_INFO(logger, "HANDLE BUDDY CHANGED " << payload.buddyname() << "-" << payload.alias());
 	LocalBuddy *buddy = (LocalBuddy *) user->getRosterManager()->getBuddy(payload.buddyname());
 	if (buddy) {
 		handleBuddyPayload(buddy, payload);
+	}
+}
 void NetworkPluginServer::handleBuddyRemovedPayload(const std::string &data) {
 	pbnetwork::Buddy payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	User *user = m_userManager->getUser(payload.username());
 	if (!user)
 		return;
 	user->getRosterManager()->removeBuddy(payload.buddyname());
+}
 void NetworkPluginServer::handleParticipantChangedPayload(const std::string &data) {
 	pbnetwork::Participant payload;
 	if (payload.ParseFromString(data) == false) {
 			case pbnetwork::WrapperMessage_Type_TYPE_FT_DATA:
 				handleFTDataPayload(c, wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_BUDDY_REMOVED:
 				handleBuddyRemovedPayload(wrapper.payload());
 				break;
 			default:
 				return;
+		}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -99,6 +99,46 @@ void RosterManager::setBuddy(Buddy *buddy) { @@
 	setBuddyCallback(buddy);
+}
 void RosterManager::removeBuddy(const std::string &name) {
 	Buddy *buddy = getBuddy(name);
 	if (!buddy) {
 		LOG4CXX_WARN(logger, m_user->getJID().toString() << ": Tried to remove unknown buddy " << name);
 		return;
+	}
 	if (m_component->inServerMode() || m_remoteRosterRequest) {
 		sendBuddyRosterRemove(buddy);
+	}
 	else {
 		sendBuddyUnsubscribePresence(buddy);
+	}
 	unsetBuddy(buddy);
 	delete buddy;
+}
 void RosterManager::sendBuddyRosterRemove(Buddy *buddy) {
 	Swift::RosterPayload::ref p = Swift::RosterPayload::ref(new Swift::RosterPayload());
 	Swift::RosterItemPayload item;
 	item.setJID(buddy->getJID().toBare());
 	item.setSubscription(Swift::RosterItemPayload::Remove);
 	p->addItem(item);
 	// In server mode we have to send pushes to all resources, but in gateway-mode we send it only to bare JID
 	if (m_component->inServerMode()) {
 		std::vector<Swift::Presence::ref> presences = m_component->getPresenceOracle()->getAllPresence(m_user->getJID().toBare());
 		BOOST_FOREACH(Swift::Presence::ref presence, presences) {
 			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(p, presence->getFrom(), m_component->getIQRouter());
 			request->send();
+		}
+	}
 	else {
 		Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(p, m_user->getJID().toBare(), m_component->getIQRouter());
 		request->send();
+	}
+}
 void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	// user can't receive anything in server mode if he's not logged in.
 	// He will ask for roster later (handled in rosterreponsder.cpp)
@@ @@ -142,6 +182,20 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) { @@
+	}
+}
 void RosterManager::sendBuddyUnsubscribePresence(Buddy *buddy) {
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(m_user->getJID());
 	response->setFrom(buddy->getJID());
 	response->setType(Swift::Presence::Unsubscribe);
 	m_component->getStanzaChannel()->sendPresence(response);
 	response = Swift::Presence::create();
 	response->setTo(m_user->getJID());
 	response->setFrom(buddy->getJID());
 	response->setType(Swift::Presence::Unsubscribed);
 	m_component->getStanzaChannel()->sendPresence(response);
+}
 void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(m_user->getJID());

0 comments (0 inline, 0 general)