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
 
@@ -546,12 +546,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
 
					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")) {

			




        

    


    
    

    

        

                

                    include/transport/networkpluginserver.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -124,12 +124,14 @@ class NetworkPluginServer {

			




	
	
	
		
 
		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);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/networkpluginserver.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1250,12 +1250,15 @@ void NetworkPluginServer::handleUserCreated(User *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;

			




	
	
		
 
@@ -1355,12 +1358,15 @@ void NetworkPluginServer::handleUserDestroyed(User *user) {

			




	
	
	
		
 

			




	
	
	
		
 
	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);

			




	
	
		
 
@@ -1535,12 +1541,38 @@ void NetworkPluginServer::handleBuddyUpdated(Buddy *b, const Swift::RosterItemPa

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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());

			




        

    


    
    

    

        

                

                    src/rostermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -499,12 +499,13 @@ void RosterManager::handleSubscription(Swift::Presence::ref presence) {

			




	
	
	
		
 
					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());

			




        

    


    
    

    

        

                

                    src/tests/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -193,12 +193,13 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
		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();

			




	
	
		
 
@@ -206,15 +207,15 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
		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();

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -234,12 +234,15 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {

			




	
	
	
		
 
			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) {

			




        

    



    


    



    



      

      





    
    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