libtransport.git Changeset - 9e70a739b7c2

Changeset - 9e70a739b7c2

Parent rev.

Child rev.

[Not reviewed]

0 8 2

Sarang Bharadwaj - 13 years ago 2012-07-23 13:43:59
sarang.bh@gmail.com

Combined fetching userlist with fetching avatars; Re-organized code

10 files changed with 363 insertions and 244 deletions:

backends/twitter/HTTPRequest.cpp

backends/twitter/HTTPRequest.h

backends/twitter/Requests/CreateFriendRequest.cpp

backends/twitter/Requests/CreateFriendRequest.h

backends/twitter/Requests/FetchFriends.cpp

backends/twitter/Requests/FetchFriends.h

backends/twitter/Requests/ProfileImageRequest.cpp

backends/twitter/Requests/ProfileImageRequest.h

backends/twitter/TwitterPlugin.cpp

172

145

backends/twitter/TwitterPlugin.h

0 comments (0 inline, 0 general)

backends/twitter/HTTPRequest.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include "HTTPRequest.h"
 DEFINE_LOGGER(logger, "HTTPRequest")
 bool HTTPRequest::init()
+{
 	curlhandle = curl_easy_init();
 	if(curlhandle) {
 		curlhandle = curl_easy_init();
 		curl_easy_setopt(curlhandle, CURLOPT_PROXY, NULL);
 		curl_easy_setopt(curlhandle, CURLOPT_PROXYUSERPWD, NULL);
 		curl_easy_setopt(curlhandle, CURLOPT_PROXYAUTH, (long)CURLAUTH_ANY);
 		return true;
+	}
 	LOG4CXX_ERROR(logger, "Couldn't Initialize curl!")
 	return false;
+}
 void HTTPRequest::setProxy(std::string IP, std::string port, std::string username, std::string password)
+{
 	if(curlhandle) {
 		std::string proxyIpPort = IP + ":" + port;
 		curl_easy_setopt(curlhandle, CURLOPT_PROXY, proxyIpPort.c_str());
 		if(username.length() && password.length()) {
 			std::string proxyUserPass = username + ":" + password;
 			curl_easy_setopt(curlhandle, CURLOPT_PROXYUSERPWD, proxyUserPass.c_str());
+		}
 	} else {
 		LOG4CXX_ERROR(logger, "Trying to set proxy while CURL isn't initialized")
+	}
+}
 int HTTPRequest::curlCallBack(char* data, size_t size, size_t nmemb, HTTPRequest* obj)
+{
     int writtenSize = 0;
     if(obj && data) {
        obj->callbackdata.append(data, size*nmemb);
 	   writtenSize = (int)(size*nmemb);
+    }
     return writtenSize;
+}
 bool HTTPRequest::GET(std::string url, 	std::string &data)
+{
 	if(curlhandle) {
 		curl_easy_setopt(curlhandle, CURLOPT_CUSTOMREQUEST, NULL);
 		curl_easy_setopt(curlhandle, CURLOPT_ENCODING, "");
 		data = "";
 		callbackdata = "";
 		memset(curl_errorbuffer, 0, 1024);
 		curl_easy_setopt(curlhandle, CURLOPT_ERRORBUFFER, curl_errorbuffer);
 		curl_easy_setopt(curlhandle, CURLOPT_WRITEFUNCTION, curlCallBack);
 		curl_easy_setopt(curlhandle, CURLOPT_WRITEDATA, this);
 		/* Set http request and url */
 		curl_easy_setopt(curlhandle, CURLOPT_HTTPGET, 1);
 		curl_easy_setopt(curlhandle, CURLOPT_VERBOSE, 1);
 		curl_easy_setopt(curlhandle, CURLOPT_URL, url.c_str());
 		/* Send http request and return status*/
 		if(CURLE_OK == curl_easy_perform(curlhandle)) {
 			data = callbackdata;
 			return true;
+		}
 	} else {
 		LOG4CXX_ERROR(logger, "CURL not initialized!")
 		strcpy(curl_errorbuffer, "CURL not initialized!");
+	}
 	return false;
+}

backends/twitter/HTTPRequest.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef HTTPREQ_H
 #define HTTPREQ_H
 #include "libtwitcurl/curl/curl.h"
 #include "transport/logging.h"
 #include <iostream>
 #include <sstream>
 #include <string.h>
 class HTTPRequest
+{
 	CURL *curlhandle;
 	char curl_errorbuffer[1024];
 	std::string error;
 	std::string callbackdata;
     static int curlCallBack(char* data, size_t size, size_t nmemb, HTTPRequest *obj);
 	public:
 	HTTPRequest() {
 		curlhandle = NULL;
+	}
 	~HTTPRequest() {
 		if(curlhandle) {
 			curl_easy_cleanup(curlhandle);
 			curlhandle = NULL;
+		}
+	}
 	bool init();
 	void setProxy(std::string, std::string, std::string, std::string);
 	bool GET(std::string, std::string &);
 	std::string getCurlError() {return std::string(curl_errorbuffer);}
 };
 #endif

backends/twitter/Requests/CreateFriendRequest.cpp

➞

Show inline comments

 #include "CreateFriendRequest.h"
 #include "../HTTPRequest.h"
 DEFINE_LOGGER(logger, "CreateFriendRequest")
 void CreateFriendRequest::run()
+{
 	LOG4CXX_INFO(logger, user << " - Sending follow request for " << frnd)
 	replyMsg = "";
@@ @@ -9,27 +10,40 @@ void CreateFriendRequest::run() @@
 	if(success) {
 		twitObj->getLastWebResponse(replyMsg);
 		LOG4CXX_INFO(logger, user << replyMsg)
 	   	friendInfo = getUser(replyMsg);
 		if(friendInfo.getScreenName() == "") LOG4CXX_INFO(logger, user << " - Was unable to fetch user info for " << frnd);
 		if(friendInfo.getScreenName() == "") {LOG4CXX_INFO(logger, user << " - Was unable to fetch user info for " << frnd)}
 		HTTPRequest req;
 		std::string img;
 		req.init();
 		req.setProxy(twitObj->getProxyServerIp(), twitObj->getProxyServerPort(), twitObj->getProxyUserName(), twitObj->getProxyPassword());
 		profileImg = "";
 		if(req.GET(friendInfo.getProfileImgURL(), img)) profileImg = img;
 		else {
 			LOG4CXX_INFO(logger, user << " - Was unable to fetch profile image of user " << frnd);
+		}
+	}
+}
 void CreateFriendRequest::finalize()
+{
 	if(!success) {
 		std::string error;
 		twitObj->getLastCurlError(error);
 		LOG4CXX_ERROR(logger, user << " - Curl error: " << error)
 		callBack(user, friendInfo, error);
+		callBack(user, friendInfo, profileImg, error);
 	} else {
 		std::string error;
 		error = getErrorMessage(replyMsg);
 		if(error.length()) {
 			LOG4CXX_ERROR(logger, user << " - " << error)
+		}
 		else LOG4CXX_INFO(logger, user << ": Now following " << frnd)
 		callBack(user, friendInfo, error);
+		callBack(user, friendInfo, profileImg, error);
+	}
+}

backends/twitter/Requests/CreateFriendRequest.h

➞

Show inline comments

@@ @@ -15,19 +15,20 @@ using namespace Transport; @@
 class CreateFriendRequest : public Thread
+{
 	twitCurl *twitObj;
 	std::string user;
 	std::string frnd;
 	std::string replyMsg;
 	boost::function< void (std::string&, User&, std::string&) > callBack;
+	boost::function< void (std::string&, User&, std::string &, std::string&) > callBack;
 	User friendInfo;
 	std::string profileImg;
 	bool success;
 	public:
 	CreateFriendRequest(twitCurl *obj, const std::string &_user, const std::string & _frnd,
 			     		 boost::function< void (std::string&, User&, std::string&) >  cb) {
+			     		 boost::function< void (std::string&, User&, std::string &, std::string&) >  cb) {
 		twitObj = obj->clone();
 		user = _user;
 		frnd = _frnd;
 		callBack = cb;
+	}

backends/twitter/Requests/FetchFriends.cpp

➞

Show inline comments

 #include "FetchFriends.h"
 #include "../HTTPRequest.h"
 DEFINE_LOGGER(logger, "FetchFriends")
 void FetchFriends::run()
+{
 	replyMsg = "";
 	success = twitObj->friendsIdsGet(twitObj->getTwitterUsername());
 	if(!success) return;
 	twitObj->getLastWebResponse( replyMsg );
 	//LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
 	std::vector<std::string> IDs = getIDs( replyMsg );
 	success = twitObj->userLookup(IDs, true);
 	if(!success) return;
 	twitObj->getLastWebResponse( replyMsg );
 	//LOG4CXX_INFO(logger, user << " - UserLookUp web response - " << replyMsg.length() << " " << replyMsg << "\n" );
 	friends = getUsers( replyMsg );
 	HTTPRequest req;
 	req.init();
 	req.setProxy(twitObj->getProxyServerIp(), twitObj->getProxyServerPort(), twitObj->getProxyUserName(), twitObj->getProxyPassword());
 	for(int i=0 ; i<friends.size() ; i++) {
 		std::string img;
 		friendAvatars.push_back("");
 		if(req.GET(friends[i].getProfileImgURL(), img)) friendAvatars[i] = img;
 		else {
 			LOG4CXX_INFO(logger, "Warning: Couldn't fetch Profile Image for " << user << "'s friend " << friends[i].getScreenName())
+		}
+	}
+}
 void FetchFriends::finalize()
+{
 	if(!success) {
 		twitObj->getLastCurlError( replyMsg );
 		LOG4CXX_ERROR(logger,  user << " - " << replyMsg)
 		callBack(user, friends, replyMsg);
+		callBack(user, friends, friendAvatars, replyMsg);
 	} else {
 		std::string error = getErrorMessage(replyMsg);
 		if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		callBack(user, friends, error);
+		callBack(user, friends, friendAvatars, error);
+	}
+}

backends/twitter/Requests/FetchFriends.h

➞

Show inline comments

@@ @@ -16,18 +16,19 @@ using namespace Transport; @@
 class FetchFriends : public Thread
+{
 	twitCurl *twitObj;
 	std::string user;
 	std::string replyMsg;
 	std::vector<User> friends;
 	std::vector<std::string> friendAvatars;
 	bool success;
 	boost::function< void (std::string, std::vector<User> &, std::string) > callBack;
+	boost::function< void (std::string, std::vector<User> &, std::vector<std::string> &, std::string) > callBack;
 	public:
 	FetchFriends(twitCurl *obj, const std::string &_user,
 			     boost::function< void (std::string, std::vector<User> &, std::string) >  cb) {
+			     boost::function< void (std::string, std::vector<User> &, std::vector<std::string> &, std::string) >  cb) {
 		twitObj = obj->clone();
 		user = _user;
 		callBack = cb;
+	}
 	~FetchFriends() {

backends/twitter/Requests/ProfileImageRequest.cpp

➞

Show inline comments

 #include "ProfileImageRequest.h"
 #include "../HTTPRequest.h"
 DEFINE_LOGGER(logger, "ProfileImageRequest")
 int ProfileImageRequest::curlCallback(char* data, size_t size, size_t nmemb, ProfileImageRequest* obj)
+{
     int writtenSize = 0;
     if(obj && data) {
        obj->callbackdata.append(data, size*nmemb);
 	   writtenSize = (int)(size*nmemb);
+    }
     return writtenSize;
+}
 bool ProfileImageRequest::fetchImage()
+{
 	LOG4CXX_INFO(logger, user << " - Fetching  profile image");
 	curl_easy_setopt(curlhandle, CURLOPT_CUSTOMREQUEST, NULL);
     curl_easy_setopt(curlhandle, CURLOPT_ENCODING, "");
 	img = "";
 	callbackdata = "";
     memset(curl_errorbuffer, 0, 1024);
 	curl_easy_setopt(curlhandle, CURLOPT_ERRORBUFFER, curl_errorbuffer);
 	curl_easy_setopt(curlhandle, CURLOPT_WRITEFUNCTION, curlCallback);
 	curl_easy_setopt(curlhandle, CURLOPT_WRITEDATA, this);
 	/* Set http request and url */
     curl_easy_setopt(curlhandle, CURLOPT_HTTPGET, 1);
     curl_easy_setopt(curlhandle, CURLOPT_VERBOSE, 1);
     curl_easy_setopt(curlhandle, CURLOPT_URL, url.c_str());
     /* Send http request and return status*/
     return (CURLE_OK == curl_easy_perform(curlhandle));
+}
 void ProfileImageRequest::run()
+{
 	if(curlhandle == NULL) {
 		error = "Failed to init CURL!";
 		success = false;
 		return;
+	}
 	success = fetchImage();
 	if(!success) error.assign(curl_errorbuffer);
 	HTTPRequest req;
 	req.init();
 	req.setProxy(ip, port, puser, ppasswd);
 	success = req.GET(url, callbackdata);
 	if(!success) error.assign(req.getCurlError());
+}
 void ProfileImageRequest::finalize()
+{
 	if(!success) {
 		LOG4CXX_ERROR(logger,  user << " - " << error)
 		img = "";
 		callBack(user, buddy, img, reqID, error);
 	} else {
 		//std::string error = getErrorMessage(replyMsg);
 		//if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		LOG4CXX_INFO(logger, user << " - " << callbackdata);
 		img = callbackdata;
 		callBack(user, buddy, img, reqID, error);
+	}
+}

backends/twitter/Requests/ProfileImageRequest.h

➞

Show inline comments

 #ifndef PROFILEIMAGE_H
 #define PROFILEIMAGE_H
 #include "../ThreadPool.h"
 #include "../libtwitcurl/curl/curl.h"
 #include "../TwitterResponseParser.h"
 #include "transport/logging.h"
 #include "transport/config.h"
 #include <string>
 #include <boost/signals.hpp>
 #include <boost/function.hpp>
@@ @@ -22,68 +21,42 @@ class ProfileImageRequest : public Thread @@
 	std::string buddy;
 	std::string url;
 	std::string img;
 	unsigned int reqID;
 	boost::function< void (std::string&, std::string&, std::string&, int, std::string&) > callBack;
 	std::string ip, port, puser, ppasswd;
 	bool success;
 	CURL *curlhandle;
 	std::string error;
 	std::string callbackdata;
 	char curl_errorbuffer[1024];
 	bool fetchImage();
     static int curlCallback( char* data, size_t size, size_t nmemb, ProfileImageRequest *obj);
 	public:
 	ProfileImageRequest(Config *config, const std::string &_user, const std::string &_buddy, const std::string &_url, unsigned int _reqID,
 			     boost::function< void (std::string&, std::string&, std::string&, int, std::string&) >  cb) {
 		curlhandle = curl_easy_init();
 		curl_easy_setopt(curlhandle, CURLOPT_PROXY, NULL);
 		curl_easy_setopt(curlhandle, CURLOPT_PROXYUSERPWD, NULL);
 		curl_easy_setopt(curlhandle, CURLOPT_PROXYAUTH, (long)CURLAUTH_ANY);
 		/************ Set proxy if available *****************************************/
 		if(CONFIG_HAS_KEY(config,"proxy.server")) {
-			std::string ip = CONFIG_STRING(config,"proxy.server");
 			ip = CONFIG_STRING(config,"proxy.server");
 			std::ostringstream out;
 			out << CONFIG_INT(config,"proxy.port");
 			std::string port = out.str();
 			std::string puser = CONFIG_STRING(config,"proxy.user");
 			std::string ppasswd = CONFIG_STRING(config,"proxy.password");
 			if(ip != "localhost" && port != "0") {
 				/* Set proxy details in cURL */
 				std::string proxyIpPort = ip + ":" + port;
 				curl_easy_setopt(curlhandle, CURLOPT_PROXY, proxyIpPort.c_str());
 			port = out.str();
 				/* Prepare username and password for proxy server */
 				if(puser.length() && ppasswd.length()) {
 					std::string proxyUserPass = puser + ":" + ppasswd;
 					curl_easy_setopt(curlhandle, CURLOPT_PROXYUSERPWD, proxyUserPass.c_str());
 			puser = CONFIG_STRING(config,"proxy.user");
 			ppasswd = CONFIG_STRING(config,"proxy.password");
+		}
+			}
+		}
 		/*****************************************************************************/
 		user = _user;
 		buddy = _buddy;
 		url = _url;
 		reqID = _reqID;
 		callBack = cb;
+	}
 	~ProfileImageRequest() {
 		if(curlhandle) {
 			curl_easy_cleanup(curlhandle);
 			curlhandle = NULL;
+		}
+	}
 	void run();
 	void finalize();
 };
 #endif

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 	tweet_timer = m_factories->getTimerFactory()->createTimer(60000);
 	message_timer = m_factories->getTimerFactory()->createTimer(60000);
 	tweet_timer->onTick.connect(boost::bind(&TwitterPlugin::pollForTweets, this));
 	message_timer->onTick.connect(boost::bind(&TwitterPlugin::pollForDirectMessages, this));
 	//tweet_timer->start();
 	//message_timer->start();
 	tweet_timer->start();
 	message_timer->start();
 	LOG4CXX_INFO(logger, "Starting the plugin.");
+}
 TwitterPlugin::~TwitterPlugin()
+{
 	delete storagebackend;
 	std::map<std::string, twitCurl*>::iterator it;
 	for(it = sessions.begin() ; it != sessions.end() ; it++) delete it->second;
 	//std::map<std::string, twitCurl*>::iterator it;
 	//for(it = sessions.begin() ; it != sessions.end() ; it++) delete it->second;
 	std::set<std::string>::iterator it;
 	for(it = onlineUsers.begin() ; it != onlineUsers.end() ; it++) delete userdb[*it].sessions;
 	delete tp;
+}
 // Send data to NetworkPlugin server
 void TwitterPlugin::sendData(const std::string &string)
+{
 	handleDataRead(d);
+}
 // User trying to login into his twitter account
 void TwitterPlugin::handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password)
+{
 	if(connectionState.count(user) && (connectionState[user] == NEW ||
 										connectionState[user] == CONNECTED ||
 										connectionState[user] == WAITING_FOR_PIN)) {
 	//if(connectionState.count(user) && (connectionState[user] == NEW ||
 	//									connectionState[user] == CONNECTED ||
 	//									connectionState[user] == WAITING_FOR_PIN)) {
 	//	LOG4CXX_INFO(logger, std::string("A session corresponding to ") + user + std::string(" is already active"))
 	//	return;
 	//}
 	if(userdb.count(user) && (userdb[user].connectionState == NEW ||
 										userdb[user].connectionState == CONNECTED ||
 										userdb[user].connectionState == WAITING_FOR_PIN)) {
 		LOG4CXX_INFO(logger, std::string("A session corresponding to ") + user + std::string(" is already active"))
 		return;
+	}
 	LOG4CXX_INFO(logger, std::string("Received login request for ") + user)
 	initUserSession(user, password);
 	handleConnected(user);
 	LOG4CXX_INFO(logger, user << ": Adding Buddy " << adminLegacyName << " " << adminAlias)
 	handleBuddyChanged(user, adminLegacyName, adminAlias, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 	nickName[user] = "";
 	//setTwitterMode(user, 0);
 	//nickName[user] = "";
 	userdb[user].nickName = "";
 	LOG4CXX_INFO(logger, "Querying database for usersettings of " << user)
 	std::string key, secret;
 	getUserOAuthKeyAndSecret(user, key, secret);
 	if(key == "" || secret == "") {
 		LOG4CXX_INFO(logger, "Intiating OAuth Flow for user " << user)
 		setTwitterMode(user, 0);
 		tp->runAsThread(new OAuthFlow(np, sessions[user], user, sessions[user]->getTwitterUsername()));
 		//tp->runAsThread(new OAuthFlow(np, userdb[user].sessions, user, userdb[user].sessions->getTwitterUsername()));
 		tp->runAsThread(new OAuthFlow(np, userdb[user].sessions, user, userdb[user].sessions->getTwitterUsername()));
 	} else {
 		LOG4CXX_INFO(logger, user << " is already registerd. Using the stored oauth key and secret")
 		LOG4CXX_INFO(logger, key << " " << secret)
 		pinExchangeComplete(user, key, secret);
+	}
+}
 // User logging out
 void TwitterPlugin::handleLogoutRequest(const std::string &user, const std::string &legacyName)
+{
 	if(onlineUsers.count(user)) {
 		delete sessions[user];
 		sessions[user] = NULL;
 		connectionState[user] = DISCONNECTED;
 		//delete sessions[user];
 		//sessions[user] = NULL;
 		//connectionState[user] = DISCONNECTED;
 		delete userdb[user].sessions;
 		userdb[user].sessions = NULL;
 		userdb[user].connectionState = DISCONNECTED;
 		onlineUsers.erase(user);
+	}
+}
 void TwitterPlugin::handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password)
+{
 		LOG4CXX_INFO(logger, "Received Join Twitter room request for " << user)
 		setTwitterMode(user, 2);
 		handleParticipantChanged(user, adminNickName, room, 0, pbnetwork::STATUS_ONLINE);
 		nickName[user] = nickname;
 		//nickName[user] = nickname;
 		userdb[user].nickName = nickname;
 		handleMessage(user, adminChatRoom, "Connected to Twitter Room! Populating your followers list", adminNickName);
 		tp->runAsThread(new FetchFriends(sessions[user], user,
 										 boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
 		//tp->runAsThread(new FetchFriends(sessions[user], user,
 		//								 boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
 		tp->runAsThread(new FetchFriends(userdb[user].sessions, user,
 										 boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3, _4)));
 	} else {
 		setTwitterMode(user, 0);
 		LOG4CXX_ERROR(logger, "Couldn't connect to chatroom - " << room <<"! Try twitter-account as chatroom to access Twitter account")
 		handleMessage(user, adminLegacyName, "Couldn't connect to chatroom! Try twitter-account as chatroom to access Twitter account");
+	}
+}
 		for(i=0 ; i<message.size() && message[i] != ' '; i++) cmd += message[i];
 		while(i<message.size() && message[i] == ' ') i++;
 		data = message.substr(i);
 		//handleMessage(user, adminLegacyName, cmd + " " + data);
-		if(cmd == "#pin") tp->runAsThread(new PINExchangeProcess(np, sessions[user], user, data));
+		if(cmd == "#pin") tp->runAsThread(new PINExchangeProcess(np, userdb[user].sessions, user, data));
 		else if(cmd == "#help") tp->runAsThread(new HelpMessageRequest(user, boost::bind(&TwitterPlugin::helpMessageResponse, this, _1, _2)));
 		else if(cmd[0] == '@') {
 			std::string username = cmd.substr(1);
-			tp->runAsThread(new DirectMessageRequest(sessions[user], user, username, data,
+			tp->runAsThread(new DirectMessageRequest(userdb[user].sessions, user, username, data,
 												     boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
+		}
-		else if(cmd == "#status") tp->runAsThread(new StatusUpdateRequest(sessions[user], user, data,
+		else if(cmd == "#status") tp->runAsThread(new StatusUpdateRequest(userdb[user].sessions, user, data,
 														boost::bind(&TwitterPlugin::statusUpdateResponse, this, _1, _2)));
-		else if(cmd == "#timeline") tp->runAsThread(new TimelineRequest(sessions[user], user, data, "",
+		else if(cmd == "#timeline") tp->runAsThread(new TimelineRequest(userdb[user].sessions, user, data, "",
 														boost::bind(&TwitterPlugin::displayTweets, this, _1, _2, _3, _4)));
 		else if(cmd == "#friends") tp->runAsThread(new FetchFriends(sessions[user], user,
 													   boost::bind(&TwitterPlugin::displayFriendlist, this, _1, _2, _3)));
 		else if(cmd == "#follow") tp->runAsThread(new CreateFriendRequest(sessions[user], user, data.substr(0,data.find('@')),
 													   boost::bind(&TwitterPlugin::createFriendResponse, this, _1, _2, _3)));
 		else if(cmd == "#unfollow") tp->runAsThread(new DestroyFriendRequest(sessions[user], user, data.substr(0,data.find('@')),
 		else if(cmd == "#friends") tp->runAsThread(new FetchFriends(userdb[user].sessions, user,
 													   boost::bind(&TwitterPlugin::displayFriendlist, this, _1, _2, _3, _4)));
 		else if(cmd == "#follow") tp->runAsThread(new CreateFriendRequest(userdb[user].sessions, user, data.substr(0,data.find('@')),
 													   boost::bind(&TwitterPlugin::createFriendResponse, this, _1, _2, _3, _4)));
 		else if(cmd == "#unfollow") tp->runAsThread(new DestroyFriendRequest(userdb[user].sessions, user, data.substr(0,data.find('@')),
 													   boost::bind(&TwitterPlugin::deleteFriendResponse, this, _1, _2, _3)));
-		else if(cmd == "#retweet") tp->runAsThread(new RetweetRequest(sessions[user], user, data,
+		else if(cmd == "#retweet") tp->runAsThread(new RetweetRequest(userdb[user].sessions, user, data,
 													   boost::bind(&TwitterPlugin::RetweetResponse, this, _1, _2)));
 		else if(cmd == "#mode") {
 			int m = 0;
 			m = atoi(data.c_str());
-			mode prevm = twitterMode[user];
+			mode prevm = userdb[user].twitterMode;
-			if((mode)m == twitterMode[user]) return;
+			if((mode)m == userdb[user].twitterMode) return;
 			if(m < 0 || m > 2) {
 				handleMessage(user, adminLegacyName, std::string("Error! Unknown mode ") + data + ". Allowed values 0,1,2." );
 				return;
+			}
 			setTwitterMode(user, m);
 			if((twitterMode[user] == SINGLECONTACT || twitterMode[user] == CHATROOM) && prevm == MULTIPLECONTACT) clearRoster(user);
 			else if(twitterMode[user] == MULTIPLECONTACT)
 				tp->runAsThread(new FetchFriends(sessions[user], user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
 			if((userdb[user].twitterMode == SINGLECONTACT || userdb[user].twitterMode == CHATROOM) && prevm == MULTIPLECONTACT) clearRoster(user);
 			else if(userdb[user].twitterMode == MULTIPLECONTACT)
 				tp->runAsThread(new FetchFriends(userdb[user].sessions, user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3, _4)));
-			//if(twitterMode[user] != CHATROOM)
+			//if(userdb[user].twitterMode != CHATROOM)
 			//	handleBuddyChanged(user, adminLegacyName, adminAlias, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 			//
 			handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 								std::string("Changed mode to ") + data, twitterMode[user] == CHATROOM ? adminNickName : "");
 			LOG4CXX_INFO(logger, user << ": Changed mode to " << data  << " <" << (twitterMode[user] == CHATROOM ? adminNickName : "") << ">" )
 			handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 								std::string("Changed mode to ") + data, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 			LOG4CXX_INFO(logger, user << ": Changed mode to " << data  << " <" << (userdb[user].twitterMode == CHATROOM ? adminNickName : "") << ">" )
+		}
-		else if(twitterMode[user] == CHATROOM) {
+		else if(userdb[user].twitterMode == CHATROOM) {
 			std::string buddy = message.substr(0, message.find(":"));
 			if(buddies[user].count(buddy) == 0) {
 				tp->runAsThread(new StatusUpdateRequest(sessions[user], user, message,
 			if(userdb[user].buddies.count(buddy) == 0) {
 				tp->runAsThread(new StatusUpdateRequest(userdb[user].sessions, user, message,
 														boost::bind(&TwitterPlugin::statusUpdateResponse, this, _1, _2)));
 			} else {
 				data = message.substr(message.find(":")+1);
-				tp->runAsThread(new DirectMessageRequest(sessions[user], user, buddy, data,
+				tp->runAsThread(new DirectMessageRequest(userdb[user].sessions, user, buddy, data,
 												 		 boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
+			}
+		}
 		else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 				                 "Unknown command! Type #help for a list of available commands.", twitterMode[user] == CHATROOM ? adminNickName : "");
 		else handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 				                 "Unknown command! Type #help for a list of available commands.", userdb[user].twitterMode == CHATROOM ? adminNickName : "");
+	}
 	else {
 		std::string buddy;
-		if(twitterMode[user] == CHATROOM) buddy = legacyName.substr(legacyName.find("/") + 1);
+		if(userdb[user].twitterMode == CHATROOM) buddy = legacyName.substr(legacyName.find("/") + 1);
 		if(legacyName != "twitter") {
-			tp->runAsThread(new DirectMessageRequest(sessions[user], user, buddy, message,
+			tp->runAsThread(new DirectMessageRequest(userdb[user].sessions, user, buddy, message,
 												 boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
+		}
+	}
+}
 void TwitterPlugin::handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector<std::string> &groups)
+{
-	if(connectionState[user] != CONNECTED) {
+	if(userdb[user].connectionState != CONNECTED) {
 		LOG4CXX_ERROR(logger, user << " is not connected to twitter!")
 		return;
+	}
 	LOG4CXX_INFO(logger, user << " Adding Twitter contact " << buddyName)
 	tp->runAsThread(new CreateFriendRequest(sessions[user], user, buddyName,
 											boost::bind(&TwitterPlugin::createFriendResponse, this, _1, _2, _3)));
 	tp->runAsThread(new CreateFriendRequest(userdb[user].sessions, user, buddyName,
 											boost::bind(&TwitterPlugin::createFriendResponse, this, _1, _2, _3, _4)));
+}
 void TwitterPlugin::handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::vector<std::string> &groups)
+{
-	if(connectionState[user] != CONNECTED) {
+	if(userdb[user].connectionState != CONNECTED) {
 		LOG4CXX_ERROR(logger, user << " is not connected to twitter!")
 		return;
+	}
-	tp->runAsThread(new DestroyFriendRequest(sessions[user], user, buddyName,
+	tp->runAsThread(new DestroyFriendRequest(userdb[user].sessions, user, buddyName,
 											 boost::bind(&TwitterPlugin::deleteFriendResponse, this, _1, _2, _3)));
+}
 void TwitterPlugin::handleVCardRequest(const std::string &user, const std::string &legacyName, unsigned int id)
+{
 	LOG4CXX_INFO(logger, user << " - VCardRequest for " << legacyName << ", " << imgURL[legacyName])
 	if(connectionState[user] != CONNECTED) {
 	LOG4CXX_INFO(logger, user << " - VCardRequest for " << legacyName << ", " << userdb[user].buddiesInfo[legacyName].getProfileImgURL())
 	if(userdb[user].connectionState != CONNECTED) {
 		LOG4CXX_ERROR(logger, user << " is not connected to twitter!")
 		return;
+	}
 	if(getTwitterMode(user) != SINGLECONTACT && buddies[user].count(legacyName) && imgURL[legacyName].length()) {
 		LOG4CXX_INFO(logger, user << " - Initiating VCard request for " << legacyName);
 		tp->runAsThread(new ProfileImageRequest(config, user, legacyName, imgURL[legacyName], id,
 	if(getTwitterMode(user) != SINGLECONTACT && userdb[user].buddies.count(legacyName) && userdb[user].buddiesInfo[legacyName].getProfileImgURL().length()) {
 		if(userdb[user].buddiesImgs.count(legacyName) == 0) {
 			tp->runAsThread(new ProfileImageRequest(config, user, legacyName, userdb[user].buddiesInfo[legacyName].getProfileImgURL(), id,
 													boost::bind(&TwitterPlugin::profileImageResponse, this, _1, _2, _3, _4, _5)));
+		}
 		handleVCard(user, id, legacyName, legacyName, "", userdb[user].buddiesImgs[legacyName]);
 		//handleVCard(user, id, legacyName, legacyName, "", "");
+	}
+}
 void TwitterPlugin::pollForTweets()
+{
 	boost::mutex::scoped_lock lock(userlock);
 	std::set<std::string>::iterator it = onlineUsers.begin();
 	while(it != onlineUsers.end()) {
 		std::string user = *it;
-		tp->runAsThread(new TimelineRequest(sessions[user], user, "", mostRecentTweetID[user],
+		tp->runAsThread(new TimelineRequest(userdb[user].sessions, user, "", userdb[user].mostRecentTweetID,
 											boost::bind(&TwitterPlugin::displayTweets, this, _1, _2, _3, _4)));
 		it++;
+	}
 	tweet_timer->start();
+}
 void TwitterPlugin::pollForDirectMessages()
+{
 	boost::mutex::scoped_lock lock(userlock);
 	std::set<std::string>::iterator it = onlineUsers.begin();
 	while(it != onlineUsers.end()) {
 		std::string user = *it;
-		tp->runAsThread(new DirectMessageRequest(sessions[user], user, "", mostRecentDirectMessageID[user],
+		tp->runAsThread(new DirectMessageRequest(userdb[user].sessions, user, "", userdb[user].mostRecentDirectMessageID,
 											boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
 		it++;
+	}
 	message_timer->start();
+}
 	if(m < 0 || m > 2) {
 		LOG4CXX_ERROR(logger, "Unknown mode " << m <<". Using default mode 0")
 		m = 0;
+	}
-	twitterMode[user] = (mode)m;
+	userdb[user].twitterMode = (mode)m;
 	//int type;
 	std::string s_m = std::string(1,m+'0');
 	LOG4CXX_ERROR(logger, "Storing mode " << m <<" for user " << user)
 	storagebackend->updateUserSetting((long)info.id, MODE, s_m);
 	return true;
 	boost::mutex::scoped_lock lock(userlock);
 	std::string username = user.substr(0,user.find('@'));
 	std::string passwd = password;
 	LOG4CXX_INFO(logger, username + "  " + passwd)
-	sessions[user] = new twitCurl();
+	userdb[user].sessions = new twitCurl();
 	if(CONFIG_HAS_KEY(config,"proxy.server")) {
 		std::string ip = CONFIG_STRING(config,"proxy.server");
 		std::ostringstream out;
 		out << CONFIG_INT(config,"proxy.port");
 		std::string port = out.str();
 		std::string puser = CONFIG_STRING(config,"proxy.user");
 		std::string ppasswd = CONFIG_STRING(config,"proxy.password");
 		LOG4CXX_INFO(logger, ip << " " << port << " " << puser << " " << ppasswd)
 		if(ip != "localhost" && port != "0") {
 			sessions[user]->setProxyServerIp(ip);
 			sessions[user]->setProxyServerPort(port);
 			sessions[user]->setProxyUserName(puser);
 			sessions[user]->setProxyPassword(ppasswd);
 			userdb[user].sessions->setProxyServerIp(ip);
 			userdb[user].sessions->setProxyServerPort(port);
 			userdb[user].sessions->setProxyUserName(puser);
 			userdb[user].sessions->setProxyPassword(ppasswd);
+		}
+	}
 	connectionState[user] = NEW;
 	sessions[user]->setTwitterUsername(username);
 	sessions[user]->setTwitterPassword(passwd);
 	sessions[user]->getOAuth().setConsumerKey(consumerKey);
 	sessions[user]->getOAuth().setConsumerSecret(consumerSecret);
 	userdb[user].connectionState = NEW;
 	userdb[user].sessions->setTwitterUsername(username);
 	userdb[user].sessions->setTwitterPassword(passwd);
 	userdb[user].sessions->getOAuth().setConsumerKey(consumerKey);
 	userdb[user].sessions->getOAuth().setConsumerSecret(consumerSecret);
+}
 void TwitterPlugin::OAuthFlowComplete(const std::string user, twitCurl *obj)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	delete sessions[user];
 	sessions[user] = obj->clone();
 	connectionState[user] = WAITING_FOR_PIN;
 	delete userdb[user].sessions;
 	userdb[user].sessions = obj->clone();
 	userdb[user].connectionState = WAITING_FOR_PIN;
+}
 void TwitterPlugin::pinExchangeComplete(const std::string user, const std::string OAuthAccessTokenKey, const std::string OAuthAccessTokenSecret)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	sessions[user]->getOAuth().setOAuthTokenKey( OAuthAccessTokenKey );
 	sessions[user]->getOAuth().setOAuthTokenSecret( OAuthAccessTokenSecret );
 	connectionState[user] = CONNECTED;
 	twitterMode[user] = (mode)getTwitterMode(user);
 	userdb[user].sessions->getOAuth().setOAuthTokenKey( OAuthAccessTokenKey );
 	userdb[user].sessions->getOAuth().setOAuthTokenSecret( OAuthAccessTokenSecret );
 	userdb[user].connectionState = CONNECTED;
 	userdb[user].twitterMode = (mode)getTwitterMode(user);
 	if(twitterMode[user] == MULTIPLECONTACT) {
 		tp->runAsThread(new FetchFriends(sessions[user], user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
 	if(userdb[user].twitterMode == MULTIPLECONTACT) {
 		tp->runAsThread(new FetchFriends(userdb[user].sessions, user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3, _4)));
+	}
 	onlineUsers.insert(user);
 	mostRecentTweetID[user] = "";
 	mostRecentDirectMessageID[user] = "";
 	userdb[user].mostRecentTweetID = "";
 	userdb[user].mostRecentDirectMessageID = "";
+}
 void TwitterPlugin::updateLastTweetID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
-	mostRecentTweetID[user] = ID;
+	userdb[user].mostRecentTweetID = ID;
+}
 std::string TwitterPlugin::getMostRecentTweetID(const std::string user)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	std::string ID = "-1";
-	if(onlineUsers.count(user)) ID = mostRecentTweetID[user];
+	if(onlineUsers.count(user)) ID = userdb[user].mostRecentTweetID;
 	return ID;
+}
 void TwitterPlugin::updateLastDMID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
-	mostRecentDirectMessageID[user] = ID;
+	userdb[user].mostRecentDirectMessageID = ID;
+}
 std::string TwitterPlugin::getMostRecentDMID(const std::string user)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	std::string ID = "";
-	if(onlineUsers.count(user)) ID = mostRecentDirectMessageID[user];
+	if(onlineUsers.count(user)) ID = userdb[user].mostRecentDirectMessageID;
 	return ID;
+}
 /************************************** Twitter response functions **********************************/
 void TwitterPlugin::statusUpdateResponse(std::string &user, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 	} else {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Status Update successful", twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Status Update successful", userdb[user].twitterMode == CHATROOM ? adminNickName : "");
+	}
+}
 void TwitterPlugin::helpMessageResponse(std::string &user, std::string &msg)
+{
 	handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						msg, twitterMode[user] == CHATROOM ? adminNickName : "");
 	handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 						msg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
+}
 void TwitterPlugin::clearRoster(const std::string user)
+{
 	if(buddies[user].size() == 0) return;
 	std::set<std::string>::iterator it = buddies[user].begin();
 	while(it != buddies[user].end()) {
 	if(userdb[user].buddies.size() == 0) return;
 	std::set<std::string>::iterator it = userdb[user].buddies.begin();
 	while(it != userdb[user].buddies.end()) {
 		//handleBuddyChanged(user, *it, *it, std::vector<std::string>(), pbnetwork::STATUS_NONE);
 		handleBuddyRemoved(user, *it);
 		it++;
+	}
-	buddies[user].clear();
+	userdb[user].buddies.clear();
+}
 void TwitterPlugin::populateRoster(std::string &user, std::vector<User> &friends, std::string &errMsg)
+void TwitterPlugin::populateRoster(std::string &user, std::vector<User> &friends, std::vector<std::string> &friendAvatars, std::string &errMsg)
+{
 	if(errMsg.length() == 0)
+	{
 		for(int i=0 ; i<friends.size() ; i++) {
 			if(twitterMode[user] == MULTIPLECONTACT)
 				handleBuddyChanged(user, friends[i].getScreenName(), friends[i].getScreenName(), std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 			else if(twitterMode[user] == CHATROOM)
 			if(userdb[user].twitterMode == MULTIPLECONTACT)
 				handleBuddyChanged(user, friends[i].getScreenName(), friends[i].getScreenName(), std::vector<std::string>(), pbnetwork::STATUS_ONLINE, "", "DUMMY");
 			else if(userdb[user].twitterMode == CHATROOM)
 				handleParticipantChanged(user, friends[i].getScreenName(), adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
 			buddies[user].insert(friends[i].getScreenName());
 			imgURL[friends[i].getScreenName()] = friends[i].getProfileImgURL();
 			userdb[user].buddies.insert(friends[i].getScreenName());
 			userdb[user].buddiesInfo[friends[i].getScreenName()] = friends[i];
 			userdb[user].buddiesImgs[friends[i].getScreenName()] = friendAvatars[i];
 			//imgURL[friends[i].getScreenName()] = friends[i].getProfileImgURL();
+		}
 	} else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							   std::string("Error populating roster - ") + errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 	} else handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							   std::string("Error populating roster - ") + errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
-	if(twitterMode[user] == CHATROOM) handleParticipantChanged(user, nickName[user], adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
+	if(userdb[user].twitterMode == CHATROOM) handleParticipantChanged(user, userdb[user].nickName, adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
+}
 void TwitterPlugin::displayFriendlist(std::string &user, std::vector<User> &friends, std::string &errMsg)
+void TwitterPlugin::displayFriendlist(std::string &user, std::vector<User> &friends, std::vector<std::string> &friendAvatars, std::string &errMsg)
+{
 	if(errMsg.length() == 0)
+	{
 		std::string userlist = "\n***************USER LIST****************\n";
 		for(int i=0 ; i < friends.size() ; i++) {
 			userlist += " - " + friends[i].getUserName() + " (" + friends[i].getScreenName() + ")\n";
+		}
 		userlist += "***************************************\n";
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							userlist, twitterMode[user] == CHATROOM ? adminNickName : "");
 	} else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							   errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							userlist, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 	} else handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							   errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
+}
 void TwitterPlugin::displayTweets(std::string &user, std::string &userRequested, std::vector<Status> &tweets , std::string &errMsg)
+{
 	if(errMsg.length() == 0) {
 		std::string timeline = "";
 		for(int i=0 ; i<tweets.size() ; i++) {
-			if(twitterMode[user] != CHATROOM) {
+			if(userdb[user].twitterMode != CHATROOM) {
 				timeline += " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")\n";
 			} else {
-				handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
+				handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 									tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")", tweets[i].getUserData().getScreenName());
+			}
+		}
 		if((userRequested == "" || userRequested == user) && tweets.size()) {
 			std::string tweetID = getMostRecentTweetID(user);
 			if(tweetID != tweets[0].getID()) updateLastTweetID(user, tweets[0].getID());
+		}
 		if(timeline.length()) handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 												  timeline, twitterMode[user] == CHATROOM ? adminNickName : "");
 	} else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							   errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		if(timeline.length()) handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 												  timeline, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 	} else handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							   errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
+}
 void TwitterPlugin::directMessageResponse(std::string &user, std::string &username, std::vector<DirectMessage> &messages, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							std::string("Error while sending direct message! - ") + errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							std::string("Error while sending direct message! - ") + errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 		return;
+	}
 	if(username != "") {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						   "Message delivered!", twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 						   "Message delivered!", userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 		return;
+	}
 	if(!messages.size()) return;
-	if(twitterMode[user] == SINGLECONTACT) {
+	if(userdb[user].twitterMode == SINGLECONTACT) {
 		std::string msglist = "";
 		std::string msgID = getMostRecentDMID(user);
 		std::string maxID = msgID;
 		for(int i=0 ; i < messages.size() ; i++) {
 		std::string msgID = getMostRecentDMID(user);
 		std::string maxID = msgID;
 		for(int i=0 ; i < messages.size() ; i++) {
 			if(cmp(msgID, messages[i].getID()) == -1) {
-				if(twitterMode[user] == MULTIPLECONTACT)
+				if(userdb[user].twitterMode == MULTIPLECONTACT)
 					handleMessage(user, messages[i].getSenderData().getScreenName(), messages[i].getMessage(), "");
 				else
 					handleMessage(user, adminChatRoom, messages[i].getMessage() + " - <Direct Message>", messages[i].getSenderData().getScreenName());
 				if(cmp(maxID, messages[i].getID()) == -1) maxID = messages[i].getID();
+			}
+		}
 		if(maxID == getMostRecentDMID(user)) LOG4CXX_INFO(logger, "No new direct messages for " << user)
 		updateLastDMID(user, maxID);
+	}
+}
 void TwitterPlugin::createFriendResponse(std::string &user, User &frnd, std::string &errMsg)
+void TwitterPlugin::createFriendResponse(std::string &user, User &frnd, std::string &img, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 		return;
+	}
 	handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						std::string("You are now following ") + frnd.getScreenName(), twitterMode[user] == CHATROOM ? adminNickName : "");
 	handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 						std::string("You are now following ") + frnd.getScreenName(), userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 	userdb[user].buddies.insert(frnd.getScreenName());
 	userdb[user].buddiesInfo[frnd.getScreenName()] = frnd;
 	userdb[user].buddiesImgs[frnd.getScreenName()] = img;
 	buddies[user].insert(frnd.getScreenName());
 	imgURL[frnd.getScreenName()] = frnd.getProfileImgURL();
 	LOG4CXX_INFO(logger, user << " - " << frnd.getScreenName() << ", " << imgURL[frnd.getScreenName()])
 	//imgURL[frnd.getScreenName()] = frnd.getProfileImgURL();
 	LOG4CXX_INFO(logger, user << " - " << frnd.getScreenName() << ", " << frnd.getProfileImgURL())
 	//handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_NONE);
 	if(twitterMode[user] == MULTIPLECONTACT) {
 		handleBuddyChanged(user, frnd.getScreenName(), frnd.getScreenName(), std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 	} else if(twitterMode[user] == CHATROOM) {
 		//buddies[user].insert(frnd);
 	if(userdb[user].twitterMode == MULTIPLECONTACT) {
 		handleBuddyChanged(user, frnd.getScreenName(), frnd.getScreenName(), std::vector<std::string>(), pbnetwork::STATUS_ONLINE, "", "DUMMY");
 	} else if(userdb[user].twitterMode == CHATROOM) {
 		//userdb[user].buddies.insert(frnd);
 		handleParticipantChanged(user, frnd.getScreenName(), adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
+	}
+}
 void TwitterPlugin::deleteFriendResponse(std::string &user, User &frnd, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 		return;
+	}
 	handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						std::string("You are not following ") + frnd.getScreenName() + " anymore", twitterMode[user] == CHATROOM ? adminNickName : "");
 	handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 						std::string("You are not following ") + frnd.getScreenName() + " anymore", userdb[user].twitterMode == CHATROOM ? adminNickName : "");
-	if (twitterMode[user] == CHATROOM) {
+	if (userdb[user].twitterMode == CHATROOM) {
 		handleParticipantChanged(user, frnd.getScreenName(), adminLegacyName, 0, pbnetwork::STATUS_NONE);
-		//buddies[user].erase(frnd);
+		//userdb[user].buddies.erase(frnd);
+	}
-	LOG4CXX_INFO(logger, user << " - " << frnd.getScreenName() << ", " << imgURL[frnd.getScreenName()])
+	LOG4CXX_INFO(logger, user << " - " << frnd.getScreenName() << ", " << frnd.getProfileImgURL())
 	buddies[user].erase(frnd.getScreenName());
 	imgURL[frnd.getScreenName()] = "";
 	userdb[user].buddies.erase(frnd.getScreenName());
 	//imgURL[frnd.getScreenName()] = "";
 	//handleBuddyRemoved(user, frnd);
-	if(twitterMode[user] == MULTIPLECONTACT) {
+	if(userdb[user].twitterMode == MULTIPLECONTACT) {
 		handleBuddyRemoved(user, frnd.getScreenName());
+	}
+}
 void TwitterPlugin::RetweetResponse(std::string &user, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 	} else {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Retweet successful", twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Retweet successful", userdb[user].twitterMode == CHATROOM ? adminNickName : "");
+	}
+}
 void TwitterPlugin::profileImageResponse(std::string &user, std::string &buddy, std::string &img, unsigned int reqID, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, userdb[user].twitterMode == CHATROOM ? adminNickName : "");
 	} else {
 		LOG4CXX_INFO(logger, user << " - Sending VCard for " << buddy)
 		handleVCard(user, reqID, buddy, buddy, "", img);
+	}
+}

backends/twitter/TwitterPlugin.h

➞

Show inline comments

@@ @@ -40,12 +40,13 @@ using namespace Transport; @@
 #define STR(x) (std::string("(") + x.from + ", " + x.to + ", " + x.message + ")")
 class TwitterPlugin;
 extern TwitterPlugin *np;
 extern Swift::SimpleEventLoop *loop_; // Event Loop
 class TwitterPlugin : public NetworkPlugin {
 	public:
 		Swift::BoostNetworkFactories *m_factories;
 		Swift::BoostIOServiceThread m_boostIOServiceThread;
 		boost::shared_ptr<Swift::Connection> m_conn;
 		Swift::Timer::ref tweet_timer;
@@ @@ -107,17 +108,17 @@ class TwitterPlugin : public NetworkPlugin { @@
 		bool setTwitterMode(const std::string user, int m);
 		/****************** Twitter Response handlers **************************************/
 		void statusUpdateResponse(std::string &user, std::string &errMsg);
 		void helpMessageResponse(std::string &user, std::string &msg);
 		void populateRoster(std::string &user, std::vector<User> &friends, std::string &errMsg);
 		void displayFriendlist(std::string &user, std::vector<User> &friends, std::string &errMsg);
 		void populateRoster(std::string &user, std::vector<User> &friends, std::vector<std::string> &friendAvatars, std::string &errMsg);
 		void displayFriendlist(std::string &user, std::vector<User> &friends, std::vector<std::string> &friendAvatars, std::string &errMsg);
 		void displayTweets(std::string &user, std::string &userRequested, std::vector<Status> &tweets , std::string &errMsg);
 		void directMessageResponse(std::string &user, std::string &username, std::vector<DirectMessage> &messages, std::string &errMsg);
 		void createFriendResponse(std::string &user, User &frnd, std::string &errMsg);
+		void createFriendResponse(std::string &user, User &frnd, std::string &img, std::string &errMsg);
 		void deleteFriendResponse(std::string &user, User &frnd, std::string &errMsg);
 		void RetweetResponse(std::string &user, std::string &errMsg);
 		void profileImageResponse(std::string &user, std::string &buddy, std::string &img, unsigned int reqID, std::string &errMsg);
 		/***********************************************************************************/
 	private:
@@ @@ -136,18 +137,37 @@ class TwitterPlugin : public NetworkPlugin { @@
 		std::string OAUTH_SECRET;
 		std::string MODE;
 		boost::mutex dblock, userlock;
 		ThreadPool *tp;
 		std::map<std::string, twitCurl*> sessions;
 		std::map<std::string, status> connectionState;
 		std::map<std::string, std::string> mostRecentTweetID;
 		std::map<std::string, std::string> mostRecentDirectMessageID;
 		//std::map<std::string, twitCurl*> sessions;
 		//std::map<std::string, status> connectionState;
 		//std::map<std::string, std::string> mostRecentTweetID;
 		//std::map<std::string, std::string> mostRecentDirectMessageID;
 		std::set<std::string> onlineUsers;
 		std::map<std::string,std::string> nickName;
 		std::map<std::string, std::set<std::string> > buddies;
 		std::map<std::string, std::string> imgURL;
 		std::map<std::string, mode> twitterMode;
 		//std::map<std::string, std::string> nickName;
 		//std::map<std::string, std::set<std::string> > buddies;
 		//std::map<std::string, std::string> imgURL;
 		//std::map<std::string, mode> twitterMode;
 		struct UserData
+		{
 			User userTwitterObj;
 			std::string userImg;
 			twitCurl* sessions;
 			status connectionState;
 			std::string mostRecentTweetID;
 			std::string mostRecentDirectMessageID;
 			std::string nickName;
 			std::set<std::string> buddies;
 			std::map<std::string, User> buddiesInfo;
 			std::map<std::string, std::string> buddiesImgs;
 			mode twitterMode;
 			UserData() { sessions = NULL; }
 		};
 		std::map<std::string, UserData> userdb;
 };
 #endif

0 comments (0 inline, 0 general)