Changeset - 505ea8301ce8
Parent rev.
Child rev.
[Not reviewed]
0 6 0
HanzZ - 13 years ago 2013-01-25 13:26:49
hanzz.k@gmail.com
Fixed adding/removing contacts in gateway mode
6 files changed with 43 insertions and 3 deletions:
backends/libpurple/main.cpp
1
include/transport/networkpluginserver.h
2
src/networkpluginserver.cpp
32
src/rostermanager.cpp
1
src/tests/user.cpp
4
3
src/user.cpp
3
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
➞
Show inline comments
 
@@ -540,24 +540,25 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
 
					purple_blist_add_contact_wrapped(purple_buddy_get_contact_wrapped(buddy), group ,NULL);
 
				}
 
				else {
 
					PurpleBuddy *buddy = purple_buddy_new_wrapped(account, buddyName.c_str(), alias.c_str());
 

			




	
	
	
		
 
					// Add newly created buddy to legacy network roster.

			




	
	
	
		
 
					PurpleGroup *group = purple_find_group_wrapped(groups.c_str());

			




	
	
	
		
 
					if (!group) {

			




	
	
	
		
 
						group = purple_group_new_wrapped(groups.c_str());

			




	
	
	
		
 
					}

			




	
	
	
		
 
					purple_blist_add_buddy_wrapped(buddy, NULL, group ,NULL);

			




	
	
	
		
 
					purple_account_add_buddy_wrapped(account, buddy);

			




	
	
	
		
 
					LOG4CXX_INFO(logger, "Adding new buddy " << buddyName.c_str() << " to legacy network roster");

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleBuddyBlockToggled(const std::string &user, const std::string &buddyName, bool blocked) {

			




	
	
	
		
 
			if (CONFIG_BOOL(config, "service.enable_privacy_lists")) {

			




	
	
	
		
 
				PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
				if (account) {

			




	
	
	
		
 
					if (blocked) {

			




	
	
	
		
 
						purple_privacy_deny_wrapped(account, buddyName.c_str(), FALSE, FALSE);

			




	
	
	
		
 
					}

			




	
	
	
		
 
					else {

			




        

    


    
    

    

        

                

                    include/transport/networkpluginserver.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -118,24 +118,26 @@ class NetworkPluginServer {

			




	
	
	
		
 
		void handleRoomListPayload(const std::string &payload);

			




	
	
	
		
 

			




	
	
	
		
 
		void handleUserCreated(User *user);

			




	
	
	
		
 
		void handleRoomJoined(User *user, const Swift::JID &who, const std::string &room, const std::string &nickname, const std::string &password);

			




	
	
	
		
 
		void handleRoomLeft(User *user, const std::string &room);

			




	
	
	
		
 
		void handleUserReadyToConnect(User *user);

			




	
	
	
		
 
		void handleUserPresenceChanged(User *user, Swift::Presence::ref presence);

			




	
	
	
		
 
		void handleUserDestroyed(User *user);

			




	
	
	
		
 

			




	
	
	
		
 
		void handleBuddyUpdated(Buddy *buddy, const Swift::RosterItemPayload &item);

			




	
	
	
		
 
		void handleBuddyRemoved(Buddy *buddy);

			




	
	
	
		
 
		void handleBuddyAdded(Buddy *buddy, const Swift::RosterItemPayload &item);

			




	
	
	
		
 
		void handleUserBuddyAdded(User *user, Buddy *buddy);

			




	
	
	
		
 
		void handleUserBuddyRemoved(User *user, Buddy *buddy);

			




	
	
	
		
 

			




	
	
	
		
 
		void handleBlockToggled(Buddy *buddy);

			




	
	
	
		
 

			




	
	
	
		
 
		void handleVCardUpdated(User *user, boost::shared_ptr<Swift::VCard> vcard);

			




	
	
	
		
 
		void handleVCardRequired(User *user, const std::string &name, unsigned int id);

			




	
	
	
		
 

			




	
	
	
		
 
		void handleFTStateChanged(Swift::FileTransfer::State state, const std::string &userName, const std::string &buddyName, const std::string &fileName, unsigned long size, unsigned long id);

			




	
	
	
		
 
		void handleFTAccepted(User *user, const std::string &buddyName, const std::string &fileName, unsigned long size, unsigned long ftID);

			




	
	
	
		
 
		void handleFTRejected(User *user, const std::string &buddyName, const std::string &fileName, unsigned long size);

			




	
	
	
		
 
		void handleFTDataNeeded(Backend *b, unsigned long ftid);

			




	
	
	
		
 

			




	
	
	
		
 
		void handlePIDTerminated(unsigned long pid);

			




        

    


    
    

    

        

                

                    src/networkpluginserver.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1244,24 +1244,27 @@ void NetworkPluginServer::handleUserCreated(User *user) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// Associate users with backend

			




	
	
	
		
 
	user->setData(c);

			




	
	
	
		
 
	c->users.push_back(user);

			




	
	
	
		
 

			




	
	
	
		
 
	// Don't forget to disconnect these in handleUserDestroyed!!!

			




	
	
	
		
 
	user->onReadyToConnect.connect(boost::bind(&NetworkPluginServer::handleUserReadyToConnect, this, user));

			




	
	
	
		
 
	user->onPresenceChanged.connect(boost::bind(&NetworkPluginServer::handleUserPresenceChanged, this, user, _1));

			




	
	
	
		
 
	user->onRoomJoined.connect(boost::bind(&NetworkPluginServer::handleRoomJoined, this, user, _1, _2, _3, _4));

			




	
	
	
		
 
	user->onRoomLeft.connect(boost::bind(&NetworkPluginServer::handleRoomLeft, this, user, _1));

			




	
	
	
		
 

			




	
	
	
		
 
	user->getRosterManager()->onBuddyAdded.connect(boost::bind(&NetworkPluginServer::handleUserBuddyAdded, this, user, _1));

			




	
	
	
		
 
	user->getRosterManager()->onBuddyRemoved.connect(boost::bind(&NetworkPluginServer::handleUserBuddyRemoved, this, user, _1));

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleUserReadyToConnect(User *user) {

			




	
	
	
		
 
	UserInfo userInfo = user->getUserInfo();

			




	
	
	
		
 

			




	
	
	
		
 
	pbnetwork::Login login;

			




	
	
	
		
 
	login.set_user(user->getJID().toBare());

			




	
	
	
		
 
	login.set_legacyname(userInfo.uin);

			




	
	
	
		
 
	login.set_password(userInfo.password);

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	login.SerializeToString(&message);

			




	
	
		
 
@@ -1349,24 +1352,27 @@ void NetworkPluginServer::handleRoomLeft(User *user, const std::string &r) {

			




	
	
	
		
 
	send(c->connection, message);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleUserDestroyed(User *user) {

			




	
	
	
		
 
	m_waitingUsers.remove(user);

			




	
	
	
		
 
	UserInfo userInfo = user->getUserInfo();

			




	
	
	
		
 

			




	
	
	
		
 
	user->onReadyToConnect.disconnect(boost::bind(&NetworkPluginServer::handleUserReadyToConnect, this, user));

			




	
	
	
		
 
	user->onPresenceChanged.disconnect(boost::bind(&NetworkPluginServer::handleUserPresenceChanged, this, user, _1));

			




	
	
	
		
 
	user->onRoomJoined.disconnect(boost::bind(&NetworkPluginServer::handleRoomJoined, this, user, _1, _2, _3, _4));

			




	
	
	
		
 
	user->onRoomLeft.disconnect(boost::bind(&NetworkPluginServer::handleRoomLeft, this, user, _1));

			




	
	
	
		
 

			




	
	
	
		
 
	user->getRosterManager()->onBuddyAdded.disconnect(boost::bind(&NetworkPluginServer::handleUserBuddyAdded, this, user, _1));

			




	
	
	
		
 
	user->getRosterManager()->onBuddyRemoved.disconnect(boost::bind(&NetworkPluginServer::handleUserBuddyRemoved, this, user, _1));

			




	
	
	
		
 

			




	
	
	
		
 
	pbnetwork::Logout logout;

			




	
	
	
		
 
	logout.set_user(user->getJID().toBare());

			




	
	
	
		
 
	logout.set_legacyname(userInfo.uin);

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	logout.SerializeToString(&message);

			




	
	
	
		
 

			




	
	
	
		
 
	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGOUT);

			




	
	
	
		
 
 

			




	
	
	
		
 
	Backend *c = (Backend *) user->getData();

			




	
	
	
		
 
	if (!c) {

			




	
	
	
		
 
		return;

			




	
	
		
 
@@ -1529,24 +1535,50 @@ void NetworkPluginServer::handleBuddyUpdated(Buddy *b, const Swift::RosterItemPa

			




	
	
	
		
 

			




	
	
	
		
 
	Backend *c = (Backend *) user->getData();

			




	
	
	
		
 
	if (!c) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	send(c->connection, message);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleBuddyAdded(Buddy *buddy, const Swift::RosterItemPayload &item) {

			




	
	
	
		
 
	handleBuddyUpdated(buddy, item);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleUserBuddyAdded(User *user, Buddy *b) {

			




	
	
	
		
 
	pbnetwork::Buddy buddy;

			




	
	
	
		
 
	buddy.set_username(user->getJID().toBare());

			




	
	
	
		
 
	buddy.set_buddyname(b->getName());

			




	
	
	
		
 
	buddy.set_alias(b->getAlias());

			




	
	
	
		
 
	BOOST_FOREACH(const std::string &g, b->getGroups()) {

			




	
	
	
		
 
		buddy.add_group(g);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	buddy.set_status(pbnetwork::STATUS_NONE);

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	buddy.SerializeToString(&message);

			




	
	
	
		
 

			




	
	
	
		
 
	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED);

			




	
	
	
		
 

			




	
	
	
		
 
	Backend *c = (Backend *) user->getData();

			




	
	
	
		
 
	if (!c) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	send(c->connection, message);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleUserBuddyRemoved(User *user, Buddy *b) {

			




	
	
	
		
 
	handleBuddyRemoved(b);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleBlockToggled(Buddy *b) {

			




	
	
	
		
 
	User *user = b->getRosterManager()->getUser();

			




	
	
	
		
 

			




	
	
	
		
 
	pbnetwork::Buddy buddy;

			




	
	
	
		
 
	buddy.set_username(user->getJID().toBare());

			




	
	
	
		
 
	buddy.set_buddyname(b->getName());

			




	
	
	
		
 
	buddy.set_alias(b->getAlias());

			




	
	
	
		
 
	BOOST_FOREACH(const std::string &g, b->getGroups()) {

			




	
	
	
		
 
		buddy.add_group(g);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	buddy.set_status(pbnetwork::STATUS_NONE);

			




	
	
	
		
 
	buddy.set_blocked(!b->isBlocked());

			




        

    


    
    

    

        

                

                    src/rostermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -493,24 +493,25 @@ void RosterManager::handleSubscription(Swift::Presence::ref presence) {

			




	
	
	
		
 
			switch (presence->getType()) {

			




	
	
	
		
 
				// buddy is not in roster, so add him

			




	
	
	
		
 
				case Swift::Presence::Subscribe:

			




	
	
	
		
 
					buddyInfo.id = -1;

			




	
	
	
		
 
					buddyInfo.alias = "";

			




	
	
	
		
 
					buddyInfo.legacyName = Buddy::JIDToLegacyName(presence->getTo());

			




	
	
	
		
 
					buddyInfo.subscription = "both";

			




	
	
	
		
 
					buddyInfo.flags = Buddy::buddyFlagsFromJID(presence->getTo());

			




	
	
	
		
 

			




	
	
	
		
 
					buddy = m_component->getFactory()->createBuddy(this, buddyInfo);

			




	
	
	
		
 
					setBuddy(buddy);

			




	
	
	
		
 
					onBuddyAdded(buddy);

			




	
	
	
		
 
					LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Subscription received for new buddy " << buddyInfo.legacyName << " => adding to legacy network");

			




	
	
	
		
 
					response->setType(Swift::Presence::Subscribed);

			




	
	
	
		
 
					break;

			




	
	
	
		
 
				case Swift::Presence::Unsubscribe:

			




	
	
	
		
 
					buddyInfo.id = -1;

			




	
	
	
		
 
					buddyInfo.alias = "";

			




	
	
	
		
 
					buddyInfo.legacyName = Buddy::JIDToLegacyName(presence->getTo());

			




	
	
	
		
 
					buddyInfo.subscription = "both";

			




	
	
	
		
 
					buddyInfo.flags = Buddy::buddyFlagsFromJID(presence->getTo());

			




	
	
	
		
 

			




	
	
	
		
 
					response->setType(Swift::Presence::Unsubscribed);

			




	
	
	
		
 
					

			




	
	
	
		
 
					buddy = m_component->getFactory()->createBuddy(this, buddyInfo);

			




        

    


    
    

    

        

                

                    src/tests/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -187,40 +187,41 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) received2.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received2[0])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::Away, dynamic_cast<Swift::Presence *>(getStanza(received2[0]))->getShow());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource2"), dynamic_cast<Swift::Presence *>(getStanza(received2[0]))->getTo().toString());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("room@localhost/anotheruser"), dynamic_cast<Swift::Presence *>(getStanza(received2[0]))->getFrom().toString());

			




	
	
	
		
 
		CPPUNIT_ASSERT(getStanza(received2[0])->getPayload<Swift::MUCUserPayload>());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::MUCOccupant::Member, *getStanza(received2[0])->getPayload<Swift::MUCUserPayload>()->getItems()[0].affiliation);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::MUCOccupant::Participant, *getStanza(received2[0])->getPayload<Swift::MUCUserPayload>()->getItems()[0].role);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handlePresenceLeaveRoom() {

			




	
	
	
		
 
		received.clear();

			




	
	
	
		
 
		Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
		response->setTo("room@localhost/hanzz");

			




	
	
	
		
 
		response->setFrom("user@localhost/resource");

			




	
	
	
		
 
		response->setType(Swift::Presence::Unavailable);

			




	
	
	
		
 

			




	
	
	
		
 
		Swift::MUCPayload *payload = new Swift::MUCPayload();

			




	
	
	
		
 
		payload->setPassword("password");

			




	
	
	
		
 
		response->addPayload(boost::shared_ptr<Swift::Payload>(payload));

			




	
	
	
		
 
		injectPresence(response);

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("room"), room);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);

			




	
	
	
		
 
// 		CPPUNIT_ASSERT_EQUAL(std::string("room"), room);

			




	
	
	
		
 
// 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);

			




	
	
	
		
 
// 		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handlePresenceLeaveRoomTwoResources() {

			




	
	
	
		
 
		handlePresenceJoinRoomTwoResources();

			




	
	
	
		
 
		received.clear();

			




	
	
	
		
 

			




	
	
	
		
 
		// User is still connected from resource2, so he should not leave the room

			




	
	
	
		
 
		Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
		response->setTo("room@localhost/hanzz");

			




	
	
	
		
 
		response->setFrom("user@localhost/resource");

			




	
	
	
		
 
		response->setType(Swift::Presence::Unavailable);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -228,24 +228,27 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {

			




	
	
	
		
 
	

			




	
	
	
		
 
	if (!presence->getTo().getNode().empty()) {

			




	
	
	
		
 
		bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';

			




	
	
	
		
 
		if (presence->getType() == Swift::Presence::Unavailable) {

			




	
	
	
		
 
			std::string room = Buddy::JIDToLegacyName(presence->getTo());

			




	
	
	
		
 
			Conversation *conv = m_conversationManager->getConversation(room);

			




	
	
	
		
 
			if (conv) {

			




	
	
	
		
 
				conv->removeJID(presence->getFrom());

			




	
	
	
		
 
				if (!conv->getJIDs().empty()) {

			




	
	
	
		
 
					return;

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else {

			




	
	
	
		
 
				return;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			if (getUserSetting("stay_connected") != "1") {

			




	
	
	
		
 
				LOG4CXX_INFO(logger, m_jid.toString() << ": Going to left room " << room);

			




	
	
	
		
 
				onRoomLeft(room);

			




	
	
	
		
 

			




	
	
	
		
 
				BOOST_FOREACH(Swift::Presence::ref &p, m_joinedRooms) {

			




	
	
	
		
 
					if (p->getTo() == presence->getTo()) {

			




	
	
	
		
 
						m_joinedRooms.remove(p);

			




	
	
	
		
 
						break;

			




	
	
	
		
 
					}

			




	
	
	
		
 
				}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-3934
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support