libtransport.git Changeset - 6e1413bf21d3

Changeset - 6e1413bf21d3

Parent rev.

Child rev.

[Not reviewed]

0 7 0

Sarang Bharadwaj - 13 years ago 2012-06-21 13:35:36
sarang.bh@gmail.com

Chatroom mode - basic working code

7 files changed with 130 insertions and 52 deletions:

backends/twitter/Requests/HelpMessageRequest.cpp

backends/twitter/Requests/HelpMessageRequest.h

backends/twitter/Requests/OAuthFlow.cpp

backends/twitter/Requests/StatusUpdateRequest.cpp

backends/twitter/Requests/StatusUpdateRequest.h

backends/twitter/TwitterPlugin.cpp

backends/twitter/TwitterPlugin.h

0 comments (0 inline, 0 general)

backends/twitter/Requests/HelpMessageRequest.cpp

➞

Show inline comments

 #include "HelpMessageRequest.h"
 DEFINE_LOGGER(logger, "HelpMessageRequest")
 void HelpMessageRequest::run()
+{
 	std::string helpMsg = "";
 	helpMsg = helpMsg
 			+ "\n******************************HELP************************************\n"
 			+ "#status <your status>      ==> Update your status\n"
 			+ "#timeline [username]       ==> Retrieve <username>'s timeline; Default - own timeline\n"
 			+ "@<username> <message>      ==> Send a directed message to the user <username>\n"
 			+ "#retweet <unique_tweet_id> ==> Retweet the tweet having id <unique_tweet_id> \n"
 			+ "#follow <username>         ==> Follow user <username>\n"
 			+ "#unfollow <username>       ==> Stop Following user <username>\n"
 			+ "#help                      ==> Print this help message\n"
 			+ "************************************************************************\n";
 	np->handleMessage(user, "twitter-account", helpMsg);
+}
 void HelpMessageRequest::finalize()
+{
 	callBack(user, helpMsg);
+}

backends/twitter/Requests/HelpMessageRequest.h

➞

Show inline comments

@@ @@ -3,25 +3,27 @@ @@
 #include "../ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/networkplugin.h"
 #include "transport/logging.h"
 #include <string>
 #include <boost/function.hpp>
 #include <iostream>
 using namespace Transport;
 class HelpMessageRequest : public Thread
+{
 	std::string user;
 	NetworkPlugin *np;
 	std::string helpMsg;
 	boost::function<void (std::string &, std::string &)> callBack;
 	public:
-	HelpMessageRequest(NetworkPlugin *_np, const std::string &_user) {
+	HelpMessageRequest(const std::string &_user, boost::function<void (std::string &, std::string &)> cb) {
 		user = _user;
-		np = _np;
+		callBack = cb;
+	}
 	void run();
 	void finalize();
 };

backends/twitter/Requests/OAuthFlow.cpp

➞

Show inline comments

@@ @@ -13,16 +13,6 @@ void OAuthFlow::finalize() @@
 	} else {
 		np->handleMessage(user, "twitter-account", std::string("Please visit the following link and authorize this application: ") + authUrl);
 		np->handleMessage(user, "twitter-account", std::string("Please reply with the PIN provided by twitter. Prefix the pin with 'pin:'. Ex. 'pin: 1234'"));
 		np->OAuthFlowComplete(user, twitObj);
+	}
+}
 /*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;*/

backends/twitter/Requests/StatusUpdateRequest.cpp

➞

Show inline comments

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

backends/twitter/Requests/StatusUpdateRequest.h

➞

Show inline comments

@@ @@ -2,29 +2,33 @@ @@
 #define STATUS_UPDATE
 #include "../ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "transport/networkplugin.h"
 #include "transport/logging.h"
 #include <boost/function.hpp>
 #include <string>
 #include <iostream>
 using namespace Transport;
 class StatusUpdateRequest : public Thread
+{
 	twitCurl *twitObj;
 	std::string data;
 	std::string user;
 	std::string replyMsg;
 	NetworkPlugin *np;
 	boost::function<void (std::string& user, std::string& errMsg)> callBack;
 	bool success;
 	public:
 	StatusUpdateRequest(NetworkPlugin *_np, twitCurl *obj, const std::string &_user, const std::string &_data) {
 	StatusUpdateRequest(twitCurl *obj, const std::string &_user, const std::string &_data,
 						boost::function<void (std::string& user, std::string& errMsg)> cb) {
 		twitObj = obj->clone();
 		data = _data;
 		user = _user;
-		np = _np;
+		callBack = cb;
+	}
 	~StatusUpdateRequest() {
 		delete twitObj;
+	}

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 	twitterMode = SINGLECONTACT;
 	if(CONFIG_HAS_KEY(config, "twitter.mode") == false) {
 		LOG4CXX_INFO(logger, "Using default single contact mode!");
 	} else twitterMode = (mode)CONFIG_INT(config, "twitter.mode");
 	adminLegacyName = "twitter-account";
 	adminNickName = "";
 	adminAlias = "twitter";
 	if(twitterMode == CHATROOM) adminNickName = "twitter";
 	consumerKey = CONFIG_STRING(config, "twitter.consumer_key");
 	consumerSecret = CONFIG_STRING(config, "twitter.consumer_secret");
 	OAUTH_KEY = "oauth_key";
 	OAUTH_SECRET = "oauth_secret";
 	m_factories = new Swift::BoostNetworkFactories(loop);
 	tp = new ThreadPool(loop_, 10);
 	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->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.");
+}
 	LOG4CXX_INFO(logger, std::string("Received login request for ") + user)
 	initUserSession(user, password);
 	handleConnected(user);
 	handleBuddyChanged(user, "twitter-account", "twitter", std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 	LOG4CXX_INFO(logger, user << ": Adding Buddy " << adminLegacyName << " " << adminAlias)
 	handleBuddyChanged(user, adminLegacyName, adminAlias, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 	nickName[user] = "";
 	LOG4CXX_INFO(logger, "Querying database for usersettings of " << user)
 	std::string key, secret;
 	getUserOAuthKeyAndSecret(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;
 		onlineUsers.erase(user);
+	}
+}
 void TwitterPlugin::handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password)
+{
 	if(room == adminLegacyName) {
 		LOG4CXX_INFO(logger, std::string("Received Join Twitter room request for ") + user)
 		handleParticipantChanged(user, adminNickName, room, 0, pbnetwork::STATUS_ONLINE);
 		nickName[user] = nickname;
 		if(twitterMode == CHATROOM) {
 			handleMessage(user, adminLegacyName, "Connected to Twitter Room! Populating your followers list", adminNickName);
+		}
 		tp->runAsThread(new FetchFriends(sessions[user], user,
 										 boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
+	}
+}
 void TwitterPlugin::handleLeaveRoomRequest(const std::string &user, const std::string &room)
+{
 	if(room == adminLegacyName && onlineUsers.count(user)) {
 		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)
+{
-	if(legacyName == "twitter-account") {
+	if(legacyName == adminLegacyName) {
 		//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, "twitter-account", cmd + " " + data);
+		//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(np, user));
+		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)));
+		}
 		else if(cmd == "#status") tp->runAsThread(new StatusUpdateRequest(np, sessions[user], user, data));
 		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 handleMessage(user, "twitter-account", "Unknown command! Type #help for a list of available commands.");
 		else if(twitterMode == CHATROOM) {
 			std::string buddy = message.substr(0, message.find(":"));
 			if(buddy == "") {
 				handleMessage(user, adminLegacyName, "Unknown command! Type #help for a list of available commands.", adminNickName);
 				return;
+			}
 			data = message.substr(message.find(":")+1);
 			tp->runAsThread(new DirectMessageRequest(sessions[user], user, buddy, data,
 												 boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3)));
+		}
 		else handleMessage(user, adminLegacyName, "Unknown command! Type #help for a list of available commands.", adminNickName);
+	}
 	else {
 		tp->runAsThread(new DirectMessageRequest(sessions[user], user, legacyName, message,
 		std::string buddy;
 		if(twitterMode == 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)));
+		}
+	}
+}
 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;
 	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, adminLegacyName, errMsg, adminNickName);
+	}
+}
 void TwitterPlugin::helpMessageResponse(std::string &user, std::string &msg)
+{
 	handleMessage(user, adminLegacyName, msg, adminNickName);
+}
 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 == MULTIPLECONTACT)
 				handleBuddyChanged(user, friends[i].getScreenName(), friends[i].getUserName(), std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 			else
 				handleParticipantChanged(user, friends[i].getScreenName(), adminLegacyName, 0, pbnetwork::STATUS_ONLINE);
+		}
 	} else handleMessage(user, "twitter-account", std::string("Error populating roster - ") + errMsg);
 	} else handleMessage(user, adminLegacyName, std::string("Error populating roster - ") + errMsg, adminNickName);
 	if(twitterMode == CHATROOM) handleParticipantChanged(user, nickName[user], adminLegacyName, 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, "twitter-account", userlist);
 	} else handleMessage(user, "twitter-account", errMsg);
 		handleMessage(user, adminLegacyName, userlist, adminNickName);
 	} else handleMessage(user, adminLegacyName, errMsg, adminNickName);
+}
 void TwitterPlugin::displayTweets(std::string &user, std::string &userRequested, std::vector<Status> &tweets , std::string &errMsg)
+{
 	if(errMsg.length() == 0) {
 			timeline += " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")\n";
+		}
 		if((userRequested == "" || userRequested == user) && tweets.size()) {
 			std::string tweetID = getMostRecentTweetID(user);
 			if(tweetID != tweets[0].getID()) updateLastTweetID(user, tweets[0].getID());
-			else timeline = ""; //have already sent the tweet earlier
+			//else timeline = ""; have already sent the tweet earlier
+		}
 		if(timeline.length()) handleMessage(user, "twitter-account", timeline);
 	} else handleMessage(user, "twitter-account", errMsg);
 		if(timeline.length()) handleMessage(user, adminLegacyName, timeline, adminNickName);
 	} else handleMessage(user, adminLegacyName, errMsg, adminNickName);
+}
 void TwitterPlugin::directMessageResponse(std::string &user, std::vector<DirectMessage> &messages, std::string &errMsg)
+{
 	if(errMsg.length()) {
-		handleMessage(user, "twitter-account", std::string("Error while sending direct message! - ") + errMsg);
+		handleMessage(user, adminLegacyName, std::string("Error while sending direct message! - ") + errMsg, adminNickName);
 		return;
+	}
 	if(!messages.size()) return;
 	if(twitterMode == SINGLECONTACT) {
 			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, "twitter-account", msglist);
+		if(msglist.length()) handleMessage(user, adminLegacyName, msglist, adminNickName);
 		updateLastDMID(user, maxID);
 	} else if(twitterMode == MULTIPLECONTACT) {
 		std::string msgID = getMostRecentDMID(user);
 		std::string maxID = msgID;
 		for(int i=0 ; i < messages.size() ; i++) {
 			if(cmp(msgID, messages[i].getID()) == -1) {
 				handleMessage(user, messages[i].getSenderData().getScreenName(), messages[i].getMessage());
+				handleMessage(user, messages[i].getSenderData().getScreenName(), messages[i].getMessage(), adminNickName);
 				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, "twitter-account", errMsg);
+		handleMessage(user, adminLegacyName, errMsg, adminNickName);
 		return;
+	}
 	if(twitterMode == SINGLECONTACT) {
-		handleMessage(user, "twitter-account", std::string("You are now following ") + frnd);
+		handleMessage(user, adminLegacyName, std::string("You are now following ") + frnd, adminNickName);
 	} else if(twitterMode == MULTIPLECONTACT) {
 		handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
+	}
+}
 void TwitterPlugin::deleteFriendResponse(std::string &user, std::string &frnd, std::string &errMsg)
+{
 	if(errMsg.length()) {
-		handleMessage(user, "twitter-account", errMsg);
+		handleMessage(user, adminLegacyName, errMsg, adminNickName);
 		return;
 	} if(twitterMode == SINGLECONTACT) {
-		handleMessage(user, "twitter-account", std::string("You are not following ") + frnd + "anymore");
+		handleMessage(user, adminLegacyName, std::string("You are not following ") + frnd + "anymore", adminNickName);
 	} else if(twitterMode == MULTIPLECONTACT) {
 		handleBuddyRemoved(user, frnd);
+	}
+}
 void TwitterPlugin::RetweetResponse(std::string &user, std::string &errMsg)
+{
 	if(errMsg.length()) {
-		handleMessage(user, "twitter-account", errMsg);
+		handleMessage(user, adminLegacyName, errMsg, adminNickName);
 		return;
+	}
+}

backends/twitter/TwitterPlugin.h

➞

Show inline comments

@@ @@ -64,12 +64,16 @@ class TwitterPlugin : public NetworkPlugin { @@
 		// User trying to login into his twitter account
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password);
 		// User logging out
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName);
 		void handleJoinRoomRequest(const std::string &/*user*/, const std::string &/*room*/, const std::string &/*nickname*/, const std::string &/*pasword*/);
 		void handleLeaveRoomRequest(const std::string &/*user*/, const std::string &/*room*/);
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "");
 		void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector<std::string> &groups);
 		void handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::vector<std::string> &groups);
@@ @@ -93,12 +97,14 @@ class TwitterPlugin : public NetworkPlugin { @@
 		void updateLastDMID(const std::string user, const std::string ID);
 		std::string getMostRecentDMID(const std::string user);
 		/****************** 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 displayTweets(std::string &user, std::string &userRequested, std::vector<Status> &tweets , std::string &errMsg);
 		void directMessageResponse(std::string &user, std::vector<DirectMessage> &messages, std::string &errMsg);
 		void createFriendResponse(std::string &user, std::string &frnd, std::string &errMsg);
 		void deleteFriendResponse(std::string &user, std::string &frnd, std::string &errMsg);
@@ @@ -107,12 +113,15 @@ class TwitterPlugin : public NetworkPlugin { @@
 	private:
 		enum status {NEW, WAITING_FOR_PIN, CONNECTED, DISCONNECTED};
 		enum mode {SINGLECONTACT, MULTIPLECONTACT, CHATROOM};
 		Config *config;
 		std::string adminLegacyName;
 		std::string adminNickName;
 		std::string adminAlias;
 		std::string consumerKey;
 		std::string consumerSecret;
 		std::string OAUTH_KEY;
 		std::string OAUTH_SECRET;
@@ @@ -121,10 +130,11 @@ class TwitterPlugin : public NetworkPlugin { @@
 		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::set<std::string> onlineUsers;
 		std::map<std::string,std::string> nickName;
 		mode twitterMode;
 };
 #endif

0 comments (0 inline, 0 general)