From c0c5673c97b601f6946101d0f60ee950498d1541 Mon Sep 17 00:00:00 2001 From: Sarang Bharadwaj Date: Mon, 6 Aug 2012 22:48:21 +0530 Subject: [PATCH] Added legacyName field to UserData --- backends/twitter/TwitterPlugin.cpp | 9 +++++---- backends/twitter/TwitterPlugin.h | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/backends/twitter/TwitterPlugin.cpp b/backends/twitter/TwitterPlugin.cpp index be4eec24..a4d35ca5 100644 --- a/backends/twitter/TwitterPlugin.cpp +++ b/backends/twitter/TwitterPlugin.cpp @@ -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); diff --git a/backends/twitter/TwitterPlugin.h b/backends/twitter/TwitterPlugin.h index 822dbf7b..162b8b98 100644 --- a/backends/twitter/TwitterPlugin.h +++ b/backends/twitter/TwitterPlugin.h @@ -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 onlineUsers; struct UserData { + std::string legacyName; User userTwitterObj; std::string userImg; twitCurl* sessions;