Changeset - c0c5673c97b6
[Not reviewed]
0 2 0
Sarang Bharadwaj - 13 years ago 2012-08-06 19:18:21
sarang.bh@gmail.com
Added legacyName field to UserData
2 files changed with 7 insertions and 5 deletions:
0 comments (0 inline, 0 general)
backends/twitter/TwitterPlugin.cpp
Show inline comments
 
@@ -118,7 +118,7 @@ void TwitterPlugin::handleLoginRequest(const std::string &user, const std::strin
 
	}
 
	
 
	LOG4CXX_INFO(logger, std::string("Received login request for ") + user)	
 
	initUserSession(user, password);
 
	initUserSession(user, legacyName, password);
 
	handleConnected(user);
 
	
 
	LOG4CXX_INFO(logger, user << ": Adding Buddy " << adminLegacyName << " " << adminAlias)
 
@@ -417,11 +417,11 @@ bool TwitterPlugin::storeUserOAuthKeyAndSecret(const std::string user, const std
 
	return true;
 
}
 

	
 
void TwitterPlugin::initUserSession(const std::string user, const std::string password)
 
void TwitterPlugin::initUserSession(const std::string user, const std::string legacyName, const std::string password)
 
{
 
	boost::mutex::scoped_lock lock(userlock);
 

	
 
	std::string username = user.substr(0,user.find('@'));
 
	std::string username = legacyName;
 
	std::string passwd = password;
 
	LOG4CXX_INFO(logger, username + "  " + passwd)
 

	
 
@@ -446,7 +446,8 @@ void TwitterPlugin::initUserSession(const std::string user, const std::string pa
 
		}
 
	}
 

	
 
	userdb[user].connectionState = NEW;			
 
	userdb[user].connectionState = NEW;
 
	userdb[user].legacyName = username;	
 
	userdb[user].sessions->setTwitterUsername(username);
 
	userdb[user].sessions->setTwitterPassword(passwd); 
 
	userdb[user].sessions->getOAuth().setConsumerKey(consumerKey);
backends/twitter/TwitterPlugin.h
Show inline comments
 
@@ -88,7 +88,7 @@ class TwitterPlugin : public NetworkPlugin {
 
		
 
		bool storeUserOAuthKeyAndSecret(const std::string user, const std::string OAuthKey, const std::string OAuthSecret);
 
		
 
		void initUserSession(const std::string user, const std::string password);
 
		void initUserSession(const std::string user, const std::string legacyName, const std::string password);
 
		
 
		void OAuthFlowComplete(const std::string user, twitCurl *obj);
 
		
 
@@ -152,6 +152,7 @@ class TwitterPlugin : public NetworkPlugin {
 
		std::set<std::string> onlineUsers;
 
		struct UserData
 
		{
 
			std::string legacyName;
 
			User userTwitterObj;
 
			std::string userImg;
 
			twitCurl* sessions;		
0 comments (0 inline, 0 general)