libtransport.git Changeset - dcdaeff7f2a4

Changeset - dcdaeff7f2a4

Parent rev.

Child rev.

[Not reviewed]

0 8 0

Sarang Bharadwaj - 13 years ago 2012-07-16 19:27:47
sarang.bh@gmail.com

changed error messages format

8 files changed with 34 insertions and 32 deletions:

backends/twitter/Requests/CreateFriendRequest.cpp

backends/twitter/Requests/DestroyFriendRequest.cpp

backends/twitter/Requests/DirectMessageRequest.cpp

backends/twitter/Requests/FetchFriends.cpp

backends/twitter/Requests/RetweetRequest.cpp

backends/twitter/Requests/StatusUpdateRequest.cpp

backends/twitter/Requests/TimelineRequest.cpp

backends/twitter/TwitterPlugin.cpp

0 comments (0 inline, 0 general)

backends/twitter/Requests/CreateFriendRequest.cpp

➞

Show inline comments

 #include "CreateFriendRequest.h"
 DEFINE_LOGGER(logger, "CreateFriendRequest")
 void CreateFriendRequest::run()
+{
 	LOG4CXX_INFO(logger, user << ": Sending follow request for " << frnd)
 	replyMsg = "";
 	success = twitObj->friendshipCreate(frnd, false);
 	if(success) twitObj->getLastWebResponse(replyMsg);
+}
 void CreateFriendRequest::finalize()
+{
 	if(!success) {
 		std::string error;
 		twitObj->getLastCurlError(error);
 		LOG4CXX_ERROR(logger, user << " Curl error: " << error)
+		LOG4CXX_ERROR(logger, user << " - Curl error: " << error)
 		callBack(user, frnd, error);
 	} else {
 		std::string error;
 		error = getErrorMessage(replyMsg);
 		if(error.length()) {
 			LOG4CXX_ERROR(logger, user << " " << error)
 			LOG4CXX_ERROR(logger, user << " " << replyMsg)
 			LOG4CXX_ERROR(logger, user << " - " << error)
 			//LOG4CXX_ERROR(logger, user << " " << replyMsg)
+		}
 		else LOG4CXX_INFO(logger, user << ": Now following " << frnd)
 		callBack(user, frnd, error);
+	}
+}

backends/twitter/Requests/DestroyFriendRequest.cpp

➞

Show inline comments

 #include "DestroyFriendRequest.h"
 DEFINE_LOGGER(logger, "DestroyFriendRequest")
 void DestroyFriendRequest::run()
+{
 	replyMsg = "";
 	success = twitObj->friendshipDestroy(frnd, false);
 	if(success) twitObj->getLastWebResponse(replyMsg);
+}
 void DestroyFriendRequest::finalize()
+{
 	if(!success) {
 		std::string error;
 		twitObj->getLastCurlError(error);
 		LOG4CXX_ERROR(logger, user << " " << error)
+		LOG4CXX_ERROR(logger, user << " Curl error: " << error)
 		callBack(user, frnd, error);
 	} else {
 		std::string error;
 		error = getErrorMessage(replyMsg);
 		if(error.length()) LOG4CXX_ERROR(logger, user << " " << error)
+		if(error.length()) LOG4CXX_ERROR(logger, user << " - " << error)
 		callBack(user, frnd, error);
+	}
+}

backends/twitter/Requests/DirectMessageRequest.cpp

➞

Show inline comments

 #include "DirectMessageRequest.h"
 DEFINE_LOGGER(logger, "DirectMessageRequest")
 void DirectMessageRequest::run()
+{
 	replyMsg = "";
 	if(username != "") success = twitObj->directMessageSend(username, data, false);
 	else success = twitObj->directMessageGet(data); /* data will contain sinceId */
 	if(success) {
 		twitObj->getLastWebResponse( replyMsg );
 		if(username == "" ) messages = getDirectMessages( replyMsg );
+	}
+}
 void DirectMessageRequest::finalize()
+{
 	if(!success) {
 		LOG4CXX_ERROR(logger, user << ": Error while sending directed message to " << username );
 		twitObj->getLastCurlError( replyMsg );
 		LOG4CXX_ERROR(logger, user << " Curl error: " << replyMsg);
 		callBack(user, username, messages, replyMsg);
 	} else {
 		std::string error = getErrorMessage(replyMsg);
 		if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		else LOG4CXX_INFO(logger, user << " - " << replyMsg)
 		callBack(user, username, messages, error);
+	}
+}

backends/twitter/Requests/FetchFriends.cpp

➞

Show inline comments

 #include "FetchFriends.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" );
+	//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" );
+	//LOG4CXX_INFO(logger, user << " - UserLookUp web response - " << replyMsg.length() << " " << replyMsg << "\n" );
 	friends = getUsers( replyMsg );
+}
 void FetchFriends::finalize()
+{
 	if(!success) {
 		twitObj->getLastCurlError( replyMsg );
 		LOG4CXX_ERROR(logger,  user << " - " << replyMsg)
 		callBack(user, friends, replyMsg);
 	} else {
 		std::string error = getErrorMessage(replyMsg);
 		if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		callBack(user, friends, error);
+	}
+}

backends/twitter/Requests/RetweetRequest.cpp

➞

Show inline comments

 #include "RetweetRequest.h"
 DEFINE_LOGGER(logger, "RetweetRequest")
 void RetweetRequest::run()
+{
 	LOG4CXX_INFO(logger, user << " Retweeting " << data)
 	success = twitObj->retweetById( data );
+}
 void RetweetRequest::finalize()
+{
 	replyMsg = "";
 	if(!success) {
 		twitObj->getLastCurlError( replyMsg );
 		LOG4CXX_ERROR(logger, user << " " << replyMsg)
+		LOG4CXX_ERROR(logger, user << " Curl error: " << replyMsg)
 		callBack(user, replyMsg);
 	} else {
 		twitObj->getLastWebResponse( replyMsg );
 		std::string error = getErrorMessage( replyMsg );
 		if(error.length()) LOG4CXX_ERROR(logger, user << " " << error)
+		if(error.length()) LOG4CXX_ERROR(logger, user << " - " << error)
 		else LOG4CXX_INFO(logger, user << " " << replyMsg);
 		callBack(user, error);
+	}
+}

backends/twitter/Requests/StatusUpdateRequest.cpp

➞

Show inline comments

 #include "StatusUpdateRequest.h"
 #include "../TwitterResponseParser.h"
 DEFINE_LOGGER(logger, "StatusUpdateRequest")
 void StatusUpdateRequest::run()
+{
 	replyMsg = "";
 	success = twitObj->statusUpdate(data);
 	if(success) {
 		twitObj->getLastWebResponse( replyMsg );
 		LOG4CXX_INFO(logger, user << "StatusUpdateRequest response " << replyMsg );
+	}
+}
 void StatusUpdateRequest::finalize()
+{
 	if(!success) {
 		twitObj->getLastCurlError( replyMsg );
-		LOG4CXX_ERROR(logger, user << ": CurlError - " << replyMsg );
+		LOG4CXX_ERROR(logger, user << " - Curl error: " << replyMsg );
 		callBack(user, replyMsg);
 	} else {
 		std::string error = getErrorMessage(replyMsg);
-		if(error.length()) LOG4CXX_ERROR(logger, user << ": " << error)
+		if(error.length()) LOG4CXX_ERROR(logger, user << " - " << error)
 		else LOG4CXX_INFO(logger, "Updated status for " << user << ": " << data);
 		callBack(user, error);
+	}
+}

backends/twitter/Requests/TimelineRequest.cpp

➞

Show inline comments

 #include "TimelineRequest.h"
 DEFINE_LOGGER(logger, "TimelineRequest")
 void TimelineRequest::run()
+{
 	LOG4CXX_INFO(logger, "Sending timeline request for user " << userRequested)
 	if(userRequested != "") success = twitObj->timelineUserGet(false, false, 20, userRequested, false);
 	else success = twitObj->timelineHomeGet(since_id);
 	if(!success) return;
 	replyMsg = "";
 	replyMsg = "";
 	twitObj->getLastWebResponse( replyMsg );
 	LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
 	//LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
 	tweets = getTimeline(replyMsg);
+}
 void TimelineRequest::finalize()
+{
 	if(!success) {
 		twitObj->getLastCurlError( replyMsg );
 		LOG4CXX_ERROR(logger,  user << " - " << replyMsg)
+		LOG4CXX_ERROR(logger,  user << " - Curl error: " << replyMsg)
 		callBack(user, userRequested, tweets, replyMsg);
 	} else {
 		std::string error = getErrorMessage(replyMsg);
 		if(error.length()) LOG4CXX_ERROR(logger,  user << " - " << error)
 		callBack(user, userRequested, tweets, error);
+	}
+}

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 	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();
 	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;
 	delete tp;
+}
 // Send data to NetworkPlugin server
 void TwitterPlugin::sendData(const std::string &string)
+{
 	m_conn->write(Swift::createSafeByteArray(string));
+}
 // Receive date from the NetworkPlugin server and invoke the appropirate payload handler (implement in the NetworkPlugin class)
 void TwitterPlugin::_handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data)
+{
 	std::string d(data->begin(), data->end());
 	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)) {
 		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);
 	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()));
 	} 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)) {
 		clearRoster(user);
 		delete sessions[user];
 		sessions[user] = NULL;
 		connectionState[user] = DISCONNECTED;
 		onlineUsers.erase(user);
+	}
+}
 void TwitterPlugin::handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password)
+{
 	if(room == adminChatRoom) {
 		LOG4CXX_INFO(logger, "Received Join Twitter room request for " << user)
 		setTwitterMode(user, 2);
 		handleParticipantChanged(user, adminNickName, room, 0, pbnetwork::STATUS_ONLINE);
 		nickName[user] = 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)));
 	} 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");
+	}
+}
 void TwitterPlugin::handleLeaveRoomRequest(const std::string &user, const std::string &room)
+{
 	if(room == adminChatRoom && onlineUsers.count(user)) {
 		LOG4CXX_INFO(logger, "Leaving chatroom! Switching back to default mode 0")
 		setTwitterMode(user, 0);
 		handleBuddyChanged(user, adminLegacyName, adminAlias, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 		//delete sessions[user];
 		//sessions[user] = NULL;
 		//connectionState[user] = DISCONNECTED;
 		//onlineUsers.erase(user);
+	}
+}
 void TwitterPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml)
+{
 	LOG4CXX_INFO(logger, "Received " << user << " --> " << legacyName << " - " << message)
 	if(legacyName == adminLegacyName || legacyName == adminChatRoom)  {
 		//char ch;
 		std::string cmd = "", data = "";
 		int i;
 		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));
 		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,
 												     boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
+		}
 		else if(cmd == "#status") tp->runAsThread(new StatusUpdateRequest(sessions[user], user, data,
 														boost::bind(&TwitterPlugin::statusUpdateResponse, this, _1, _2)));
 		else if(cmd == "#timeline") tp->runAsThread(new TimelineRequest(sessions[user], 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('@')),
 													   boost::bind(&TwitterPlugin::deleteFriendResponse, this, _1, _2, _3)));
 		else if(cmd == "#retweet") tp->runAsThread(new RetweetRequest(sessions[user], 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];
 			if((mode)m == twitterMode[user]) 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(twitterMode[user] != 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 : "") << ">" )
+		}
 		else if(twitterMode[user] == CHATROOM) {
 			std::string buddy = message.substr(0, message.find(":"));
 			if(buddies[user].count(buddy) == 0) {
 				tp->runAsThread(new StatusUpdateRequest(sessions[user], 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,
 												 		 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 {
 		std::string buddy;
 		if(twitterMode[user] == CHATROOM) buddy = legacyName.substr(legacyName.find("/") + 1);
 		if(legacyName != "twitter") {
 			tp->runAsThread(new DirectMessageRequest(sessions[user], 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) {
 		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)));
+}
 void TwitterPlugin::handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::vector<std::string> &groups)
+{
 	if(connectionState[user] != CONNECTED) {
 		LOG4CXX_ERROR(logger, user << " is not connected to twitter!")
 		return;
+	}
 	tp->runAsThread(new DestroyFriendRequest(sessions[user], user, buddyName,
 											 boost::bind(&TwitterPlugin::deleteFriendResponse, this, _1, _2, _3)));
+}
 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],
 											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],
 											boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
 		it++;
+	}
 	message_timer->start();
+}
 bool TwitterPlugin::getUserOAuthKeyAndSecret(const std::string user, std::string &key, std::string &secret)
+{
 	boost::mutex::scoped_lock lock(dblock);
 	UserInfo info;
 	if(storagebackend->getUser(user, info) == false) {
 		LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!")
 		return false;
+	}
 	key="", secret=""; int type;
 	storagebackend->getUserSetting((long)info.id, OAUTH_KEY, type, key);
 	storagebackend->getUserSetting((long)info.id, OAUTH_SECRET, type, secret);
 	return true;
+}
 int TwitterPlugin::getTwitterMode(const std::string user)
+{
 	boost::mutex::scoped_lock lock(dblock);
 	UserInfo info;
 	if(storagebackend->getUser(user, info) == false) {
 		LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!")
 		return -1;
+	}
 	int type; int m;
 	std::string s_m;
 	storagebackend->getUserSetting((long)info.id, MODE, type, s_m);
 	if(s_m == "") {
 		s_m  = "0";
 		storagebackend->updateUserSetting((long)info.id, MODE, s_m);
+	}
 	m = atoi(s_m.c_str());
 	return m;
+}
 bool TwitterPlugin::setTwitterMode(const std::string user, int m)
+{
 	boost::mutex::scoped_lock lock(dblock);
 	UserInfo info;
 	if(storagebackend->getUser(user, info) == false) {
 		LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!")
 		return false;
+	}
 	if(m < 0 || m > 2) {
 		LOG4CXX_ERROR(logger, "Unknown mode " << m <<". Using default mode 0")
 		m = 0;
+	}
 	twitterMode[user] = (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;
+}
 bool TwitterPlugin::storeUserOAuthKeyAndSecret(const std::string user, const std::string OAuthKey, const std::string OAuthSecret)
+{
 	boost::mutex::scoped_lock lock(dblock);
 	UserInfo info;
 	if(storagebackend->getUser(user, info) == false) {
 		LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!")
 		return false;
+	}
 	storagebackend->updateUserSetting((long)info.id, OAUTH_KEY, OAuthKey);
 	storagebackend->updateUserSetting((long)info.id, OAUTH_SECRET, OAuthSecret);
 	return true;
+}
 void TwitterPlugin::initUserSession(const std::string user, const std::string password)
+{
 	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();
 	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);
+		}
+	}
 	connectionState[user] = NEW;
 	sessions[user]->setTwitterUsername(username);
 	sessions[user]->setTwitterPassword(passwd);
 	sessions[user]->getOAuth().setConsumerKey(consumerKey);
 	sessions[user]->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;
+}
 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);
 	//if(twitterMode[user] == MULTIPLECONTACT) {
 	tp->runAsThread(new FetchFriends(sessions[user], user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
 	//}
 	if(twitterMode[user] == MULTIPLECONTACT) {
 		tp->runAsThread(new FetchFriends(sessions[user], user, boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
+	}
 	onlineUsers.insert(user);
 	mostRecentTweetID[user] = "";
 	mostRecentDirectMessageID[user] = "";
+}
 void TwitterPlugin::updateLastTweetID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	mostRecentTweetID[user] = 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];
 	return ID;
+}
 void TwitterPlugin::updateLastDMID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	mostRecentDirectMessageID[user] = 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];
 	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 : "");
 	} else {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Status Update successful", twitterMode[user] == CHATROOM ? adminNickName : "");
+	}
+}
 void TwitterPlugin::helpMessageResponse(std::string &user, std::string &msg)
+{
 	handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						msg, twitterMode[user] == 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()) {
 		handleBuddyChanged(user, *it, *it, std::vector<std::string>(), pbnetwork::STATUS_NONE);
-		//handleBuddyRemoved(user, *it);
 		handleBuddyRemoved(user, *it);
 		it++;
+	}
-	//buddies[user].clear();
 	buddies[user].clear();
+}
 void TwitterPlugin::populateRoster(std::string &user, std::vector<User> &friends, 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)
+			else if(twitterMode[user] == CHATROOM) {
 				handleParticipantChanged(user, friends[i].getScreenName(), adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
 			buddies[user].insert(friends[i].getScreenName());
 				buddies[user].insert(friends[i].getScreenName());
+			}
+		}
 	} else handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							   std::string("Error populating roster - ") + errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 	if(twitterMode[user] == CHATROOM) handleParticipantChanged(user, nickName[user], adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
+}
 void TwitterPlugin::displayFriendlist(std::string &user, std::vector<User> &friends, 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 : "");
+}
 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) {
 				timeline += " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")\n";
 			} else {
 				handleMessage(user, twitterMode[user] == 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 : "");
+}
 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 : "");
 		return;
+	}
 	if(username != "") {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						   "Message delivered!", twitterMode[user] == CHATROOM ? adminNickName : "");
 		return;
+	}
 	if(!messages.size()) return;
 	if(twitterMode[user] == SINGLECONTACT) {
 		std::string msglist = "";
 		std::string msgID = getMostRecentDMID(user);
 		std::string maxID = msgID;
 		for(int i=0 ; i < messages.size() ; i++) {
 			if(cmp(msgID, messages[i].getID()) == -1) {
 				msglist += " - " + messages[i].getSenderData().getScreenName() + ": " + messages[i].getMessage() + "\n";
 				if(cmp(maxID, messages[i].getID()) == -1) maxID = messages[i].getID();
+			}
+		}
 		if(msglist.length()) handleMessage(user, adminLegacyName, msglist, "");
 		updateLastDMID(user, maxID);
 	} else {
 		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)
 					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, std::string &frnd, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		return;
+	}
 	handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						std::string("You are now following ") + frnd, twitterMode[user] == CHATROOM ? adminNickName : "");
 	buddies[user].insert(frnd);
 	handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_NONE);
 	//buddies[user].insert(frnd);
 	//handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_NONE);
 	if(twitterMode[user] == MULTIPLECONTACT) {
 		handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 	} else if(twitterMode[user] == CHATROOM) {
 		buddies[user].insert(frnd);
 		handleParticipantChanged(user, frnd, adminChatRoom, 0, pbnetwork::STATUS_ONLINE);
+	}
+}
 void TwitterPlugin::deleteFriendResponse(std::string &user, std::string &frnd, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 		return;
+	}
 	handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 						std::string("You are not following ") + frnd + " anymore", twitterMode[user] == CHATROOM ? adminNickName : "");
 	if (twitterMode[user] == CHATROOM) {
 		handleParticipantChanged(user, frnd, adminLegacyName, 0, pbnetwork::STATUS_NONE);
 		buddies[user].erase(frnd);
+	}
 	buddies[user].erase(frnd);
 	handleBuddyRemoved(user, frnd);
 	//if(twitterMode[user] == MULTIPLECONTACT) {
 	//	handleBuddyRemoved(user, frnd);
 	//}
 	//buddies[user].erase(frnd);
 	//handleBuddyRemoved(user, frnd);
 	if(twitterMode[user] == MULTIPLECONTACT) {
 		handleBuddyRemoved(user, frnd);
+	}
+}
 void TwitterPlugin::RetweetResponse(std::string &user, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							errMsg, twitterMode[user] == CHATROOM ? adminNickName : "");
 	} else {
 		handleMessage(user, twitterMode[user] == CHATROOM ? adminChatRoom : adminLegacyName,
 							"Retweet successful", twitterMode[user] == CHATROOM ? adminNickName : "");
+	}
+}

0 comments (0 inline, 0 general)