libtransport.git Changeset - ac7bbb6cccf3

Changeset - ac7bbb6cccf3

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 14 years ago 2011-06-09 12:46:49
hanzz.k@gmail.com

Handle jabber:iq:roster sets

3 files changed with 38 insertions and 1 deletions:

src/localbuddy.cpp

src/rosterresponder.cpp

src/sqlite3backend.cpp

0 comments (0 inline, 0 general)

src/localbuddy.cpp

➞

Show inline comments

@@ @@ -24,6 +24,7 @@ @@
 namespace Transport {
 LocalBuddy::LocalBuddy(RosterManager *rosterManager, long id) : Buddy(rosterManager, id) {
 	m_status = Swift::StatusShow::None;
+}
 LocalBuddy::~LocalBuddy() {

src/rosterresponder.cpp

➞

Show inline comments

@@ @@ -27,6 +27,7 @@ @@
 #include "transport/user.h"
 #include "transport/usermanager.h"
 #include "transport/rostermanager.h"
 #include "transport/buddy.h"
 using namespace Swift;
 using namespace boost;
 bool RosterResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::RosterPayload> payload) {
 	sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
 	User *user = m_userManager->getUser(from.toBare().toString());
 	if (!user) {
 		return true;
+	}
 	if (payload->getItems().size() == 0) {
 		return true;
+	}
 	Swift::RosterItemPayload item = payload->getItems()[0];
 	Buddy *buddy = user->getRosterManager()->getBuddy(Buddy::JIDToLegacyName(item.getJID()));
 	if (buddy) {
 		if (item.getSubscription() == Swift::RosterItemPayload::Remove) {
 			std::cout << "BUDDY REMOVED\n";
+		}
 		else {
 			std::cout << "BUDDY UPDATED\n";
+		}
+	}
 	else if (item.getSubscription() != Swift::RosterItemPayload::Remove) {
 		// Roster push for this new buddy is sent by RosterManager
 		BuddyInfo buddyInfo;
 		buddyInfo.id = -1;
 		buddyInfo.alias = item.getName();
 		buddyInfo.legacyName = Buddy::JIDToLegacyName(item.getJID());
 		buddyInfo.subscription = "both";
 		buddyInfo.flags = 0;
 		buddy = user->getComponent()->getFactory()->createBuddy(user->getRosterManager(), buddyInfo);
 		user->getRosterManager()->setBuddy(buddy);
 		std::cout << "BUDDY ADDED\n";
+	}
 	return true;
+}

src/sqlite3backend.cpp

➞

Show inline comments

 	BIND_INT(m_addBuddy, userId);
 	BIND_STR(m_addBuddy, buddyInfo.legacyName);
 	BIND_STR(m_addBuddy, buddyInfo.subscription);
 	BIND_STR(m_addBuddy, buddyInfo.groups[0]); // TODO: serialize groups
+	BIND_STR(m_addBuddy, buddyInfo.groups.size() == 0 ? "" : buddyInfo.groups[0]); // TODO: serialize groups
 	BIND_STR(m_addBuddy, buddyInfo.alias);
 	BIND_INT(m_addBuddy, buddyInfo.flags);

0 comments (0 inline, 0 general)