libtransport.git Changeset - 2fa021b7baf0

Changeset - 2fa021b7baf0

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Sarang Bharadwaj - 13 years ago 2012-05-31 15:23:45
sarang.bh@gmail.com

Restructured the code

2 files changed with 39 insertions and 34 deletions:

backends/twitter/libtwitcurl/twitcurl.cpp

backends/twitter/main.cpp

0 comments (0 inline, 0 general)

backends/twitter/libtwitcurl/twitcurl.cpp

➞

Show inline comments

@@ @@ -1461,12 +1461,13 @@ bool twitCurl::performGet( const std::string& getUrl ) @@
             curl_easy_setopt( m_curlHandle, CURLOPT_HTTPHEADER, pOAuthHeaderList );
+        }
+    }
     /* Set http request and url */
     curl_easy_setopt( m_curlHandle, CURLOPT_HTTPGET, 1 );
 //    curl_easy_setopt( m_curlHandle, CURLOPT_VERBOSE, 1 );
     curl_easy_setopt( m_curlHandle, CURLOPT_URL, getUrl.c_str() );
     /* Send http request */
     if( CURLE_OK == curl_easy_perform( m_curlHandle ) )
+    {
         if( pOAuthHeaderList )

backends/twitter/main.cpp

➞

Show inline comments

@@ @@ -131,27 +131,25 @@ class TwitterPlugin : public NetworkPlugin { @@
 			std::string key="", secret="";
 			int type;
 			storagebackend->getUserSetting((long)info.id, OAUTH_KEY, type, key);
 			storagebackend->getUserSetting((long)info.id, OAUTH_SECRET, type, secret);
-			if(key == "" || secret == ""/*registeredUsers.count(user) == 0*/) {
 			if(key == "" || secret == "") {
 				LOG4CXX_INFO(logger, "Intiating oauthflow for user " << user)
 				std::string authUrl;
 				if (sessions[user]->oAuthRequestToken( authUrl ) == false ) {
 					LOG4CXX_ERROR(logger, "Error creating twitter authorization url!");
 					handleLogoutRequest(user, username);
 					return;
+				}
 				handleMessage(user, "twitter-account", std::string("Please visit the following link and authorize this application: ") + authUrl);
 				handleMessage(user, "twitter-account", std::string("Please reply with the PIN provided by twitter. Prefix the pin with 'pin:'. Ex. 'pin: 1234'"));
 				connectionState[user] = WAITING_FOR_PIN;
 			} else {
 				//std::vector<std::string> keysecret;
 				//db->fetch(user, keysecret);
 				LOG4CXX_INFO(logger, user << " is already registerd. Using the stored oauth key and secret")
 				LOG4CXX_INFO(logger, key << " " << secret)
 				sessions[user]->getOAuth().setOAuthTokenKey( key );
 				sessions[user]->getOAuth().setOAuthTokenSecret( secret );
 				connectionState[user] = CONNECTED;
@@ @@ -162,37 +160,25 @@ class TwitterPlugin : public NetworkPlugin { @@
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 			delete sessions[user];
 			sessions[user] = NULL;
 			connectionState[user] = DISCONNECTED;
+		}
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "") {
 			LOG4CXX_INFO(logger, "Sending message from " << user << " to " << legacyName << ".");
 			if(legacyName == "twitter-account") {
 				std::string cmd = message.substr(0, message.find(':'));
 				std::string data = message.substr(message.find(':') + 1);
 				handleMessage(user, "twitter-account", cmd + " " + data);
 				if(cmd == "pin") {
 		void handlePINExchange(const std::string &user, std::string &data) {
 			sessions[user]->getOAuth().setOAuthPin( data );
 			if (sessions[user]->oAuthAccessToken() == false) {
 				LOG4CXX_ERROR(logger, "Error while exchanging PIN with AcessToken!")
 				handleLogoutRequest(user, "");
 				return;
+			}
 			std::string OAuthAccessTokenKey, OAuthAccessTokenSecret;
 			sessions[user]->getOAuth().getOAuthTokenKey( OAuthAccessTokenKey );
 			sessions[user]->getOAuth().getOAuthTokenSecret( OAuthAccessTokenSecret );
 					//db->insert(UserData(user, OAuthAccessTokenKey, OAuthAccessTokenSecret));
 					//registeredUsers.insert(user);
 			UserInfo info;
 			if(storagebackend->getUser(user, info) == false) {
 				LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!")
 				handleLogoutRequest(user, "");
 				return;
+			}
@@ @@ -200,82 +186,100 @@ class TwitterPlugin : public NetworkPlugin { @@
 			storagebackend->updateUserSetting((long)info.id, OAUTH_SECRET, OAuthAccessTokenSecret);
 			connectionState[user] = CONNECTED;
 			LOG4CXX_INFO(logger, "Sent PIN " << data << " and obtained access token");
+		}
 				if(cmd == "#help") {
 					std::string helpMsg = "\nHELP\n\
 status:<your status> - Update your status\n\
 #timeline - Retrieve your timeline\n\
 @<username>:<message> - Send a directed message to the user <username>\n\
 #help - print this help message\n";
 		void printHelpMessage(const std::string &user) {
 			std::string helpMsg = "";
 			helpMsg = helpMsg
 				    + "\nHELP\n"
 					+ "status:<your status> - Update your status\n"
 					+ "#timeline - Retrieve your timeline\n"
 					+ "@<username>:<message> - Send a directed message to the user <username>\n"
 					+ "#help - print this help message\n";
 			handleMessage(user, "twitter-account", helpMsg);
+		}
 				if(cmd[0] == '@') {
 					std::string username = cmd.substr(1);
 		void handleDirectMessage(const std::string &user, std::string &username, std::string &data) {
 			if(sessions[user]->directMessageSend(username, data, false) == false) {
 				LOG4CXX_ERROR(logger, "Error while sending directed message to user " << username );
 				return;
+			}
 			LOG4CXX_INFO(logger, "Sending " << data << " to " << username)
 			std::string replyMsg;
 			sessions[user]->getLastWebResponse( replyMsg );
 			LOG4CXX_INFO(logger, replyMsg);
+		}
-				if(cmd == "status") {
+		void handleStatusUpdate(const std::string &user, std::string &data) {
 			if(connectionState[user] != CONNECTED) {
 				LOG4CXX_ERROR(logger, "Trying to update status for " << user << " when not connected!");
 				return;
+			}
 			std::string replyMsg;
 			if( sessions[user]->statusUpdate( data ) ) {
 				replyMsg = "";
 				while(replyMsg.length() == 0) {
 					sessions[user]->getLastWebResponse( replyMsg );
+				}
 				LOG4CXX_INFO(logger, "twitCurl:statusUpdate web response: " << replyMsg );
+					}
 					else {
 			} else {
 				sessions[user]->getLastCurlError( replyMsg );
 				LOG4CXX_INFO(logger, "twitCurl::statusUpdate error: " << replyMsg );
+			}
 			LOG4CXX_INFO(logger, "Updated status for " << user << ": " << data);
+		}
-				if(cmd == "#timeline") {
+		void fetchTimeline(const std::string &user) {
 			if(connectionState[user] != CONNECTED) {
 				LOG4CXX_ERROR(logger, "Trying to update status for " << user << " when not connected!");
 				return;
+			}
 					std::string replyMsg;
 					if( sessions[user]->timelineHomeGet()/*(false, false, 20, sessions[user]->getTwitterUsername(), true)*/ ) {
 			std::string replyMsg = "";
 			if( sessions[user]->timelineHomeGet()) {
 				while(replyMsg.length() == 0) {
 					sessions[user]->getLastWebResponse( replyMsg );
 						LOG4CXX_INFO(logger, "twitCurl::timeline web response: " << replyMsg );
+				}
 				LOG4CXX_INFO(logger, "twitCurl::timeline web response: " << replyMsg.length() << " " << replyMsg << "\n" );
 				std::vector<Status> tweets = getTimeline(replyMsg);
 				std::string timeline = "\n";
 				for(int i=0 ; i<tweets.size() ; i++) {
 					timeline += tweets[i].getTweet() + "\n";
+				}
 				handleMessage(user, "twitter-account", timeline);
 			} else {
 				sessions[user]->getLastCurlError( replyMsg );
 				LOG4CXX_INFO(logger, "twitCurl::timeline error: " << replyMsg );
+			}
+		}
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "") {
 			LOG4CXX_INFO(logger, "Sending message from " << user << " to " << legacyName << ".");
 			if(legacyName == "twitter-account") {
 				std::string cmd = message.substr(0, message.find(':'));
 				std::string data = message.substr(message.find(':') + 1);
 				handleMessage(user, "twitter-account", cmd + " " + data);
 				if(cmd == "#pin") handlePINExchange(user, data);
 				else if(cmd == "#help") printHelpMessage(user);
 				else if(cmd[0] == '@') {std::string username = cmd.substr(1); handleDirectMessage(user, username, data);}
 				else if(cmd == "#status") handleStatusUpdate(user, data);
 				else if(cmd == "#timeline") fetchTimeline(user);
+			}
+		}
 		void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector<std::string> &groups) {
 			LOG4CXX_INFO(logger, user << ": Added buddy " << buddyName << ".");
 			handleBuddyChanged(user, buddyName, alias, groups, pbnetwork::STATUS_ONLINE);

0 comments (0 inline, 0 general)