libtransport.git Changeset - cca74cda6862

Changeset - cca74cda6862

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Sarang Bharadwaj - 13 years ago 2012-07-04 19:54:28
sarang.bh@gmail.com

Some more changes to Chatroom mode

6 files changed with 50 insertions and 28 deletions:

backends/twitter/Requests/DirectMessageRequest.cpp

backends/twitter/Requests/DirectMessageRequest.h

backends/twitter/Requests/OAuthFlow.cpp

backends/twitter/Requests/PINExchangeProcess.cpp

backends/twitter/TwitterPlugin.cpp

backends/twitter/TwitterPlugin.h

0 comments (0 inline, 0 general)

backends/twitter/Requests/DirectMessageRequest.cpp

➞

Show inline comments

@@ @@ -19,11 +19,11 @@ void DirectMessageRequest::finalize() @@
 	if(!success) {
 		LOG4CXX_ERROR(logger, user << ": Error while sending directed message to " << username );
 		twitObj->getLastCurlError( replyMsg );
 		callBack(user, messages, 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, messages, error);
+		callBack(user, username, messages, error);
+	}
+}

backends/twitter/Requests/DirectMessageRequest.h

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ class DirectMessageRequest : public Thread @@
 	std::string user;
 	std::string username;
 	std::string replyMsg;
 	boost::function< void (std::string&, std::vector<DirectMessage>&, std::string&) > callBack;
+	boost::function< void (std::string&, std::string &, std::vector<DirectMessage>&, std::string&) > callBack;
 	std::vector<DirectMessage> messages;
 	bool success;
 	public:
 	DirectMessageRequest(twitCurl *obj, const std::string &_user, const std::string & _username, const std::string &_data,
 			     		boost::function< void (std::string&, std::vector<DirectMessage>&, std::string&) >  cb) {
+			     		boost::function< void (std::string&, std::string &, std::vector<DirectMessage>&, std::string&) >  cb) {
 		twitObj = obj->clone();
 		data = _data;
 		user = _user;

backends/twitter/Requests/OAuthFlow.cpp

➞

Show inline comments

@@ @@ -9,6 +9,7 @@ void OAuthFlow::finalize() @@
+{
 	if (!success) {
 		LOG4CXX_ERROR(logger, "Error creating twitter authorization url!");
 		np->handleMessage(user, "twitter-account", "Error creating twitter authorization url!");
 		np->handleLogoutRequest(user, username);
 	} else {
 		np->handleMessage(user, "twitter-account", std::string("Please visit the following link and authorize this application: ") + authUrl);

backends/twitter/Requests/PINExchangeProcess.cpp

➞

Show inline comments

@@ @@ -12,6 +12,7 @@ void PINExchangeProcess::finalize() @@
+{
 	if(!success) {
 		LOG4CXX_ERROR(logger, user << ": Error while exchanging PIN for Access Token!")
 		np->handleMessage(user, "twitter-account", "Error while exchanging PIN for Access Token!");
 		np->handleLogoutRequest(user, "");
 	} else {
 		std::string replyMsg;

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 		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)));
+												     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)));
 													   boost::bind(&TwitterPlugin::RetweetResponse, this, _1, _2)));
 		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;
 			if(chatroomBuddies[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)));
+			}
 			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);
+	}
 		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)));
+												 boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
+		}
+	}
+}
@@ @@ -271,7 +272,7 @@ void TwitterPlugin::pollForDirectMessages() @@
 	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)));
+											boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
 		it++;
+	}
 	message_timer->start();
 		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
+			else {
 				handleParticipantChanged(user, friends[i].getScreenName(), adminLegacyName, 0, pbnetwork::STATUS_ONLINE);
 				chatroomBuddies[user].insert(friends[i].getScreenName());
+			}
+		}
 	} else handleMessage(user, adminLegacyName, std::string("Error populating roster - ") + errMsg, adminNickName);
 		std::string timeline = "";
 		for(int i=0 ; i<tweets.size() ; i++) {
 			timeline += " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")\n";
 			if(twitterMode != CHATROOM) {
 				timeline += " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")\n";
 			} else {
 				handleMessage(user, adminLegacyName, tweets[i].getTweet(), 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());
 			//else timeline = ""; have already sent the tweet earlier
+		}
 		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)
+void TwitterPlugin::directMessageResponse(std::string &user, std::string &username, std::vector<DirectMessage> &messages, std::string &errMsg)
+{
 	if(errMsg.length()) {
 		handleMessage(user, adminLegacyName, std::string("Error while sending direct message! - ") + errMsg, adminNickName);
 		return;
+	}
 	if(username != "") {
 		handleMessage(user, adminLegacyName, "Message delivered!", adminNickName);
 		return;
+	}
 	if(!messages.size()) return;
 		if(msglist.length()) handleMessage(user, adminLegacyName, msglist, adminNickName);
 		updateLastDMID(user, maxID);
-	} else if(twitterMode == MULTIPLECONTACT) {
 	} 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) {
 				handleMessage(user, messages[i].getSenderData().getScreenName(), messages[i].getMessage(), adminNickName);
 				if(twitterMode == MULTIPLECONTACT)
 					handleMessage(user, messages[i].getSenderData().getScreenName(), messages[i].getMessage(), adminNickName);
 				else
 					handleMessage(user, adminLegacyName, std::string("*") + messages[i].getMessage(), messages[i].getSenderData().getScreenName());
 				if(cmp(maxID, messages[i].getID()) == -1) maxID = messages[i].getID();
+			}
+		}
 		return;
+	}
 	if(twitterMode == SINGLECONTACT) {
 		handleMessage(user, adminLegacyName, std::string("You are now following ") + frnd, adminNickName);
 	} else if(twitterMode == MULTIPLECONTACT) {
 		handleMessage(user, adminLegacyName, std::string("You are now following ") + frnd, adminNickName);
 	handleMessage(user, adminLegacyName, std::string("You are now following ") + frnd, adminNickName);
 	if(twitterMode == MULTIPLECONTACT) {
 		handleBuddyChanged(user, frnd, frnd, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 	} else if(twitterMode == CHATROOM) {
 		handleParticipantChanged(user, frnd, adminLegacyName, 0, pbnetwork::STATUS_ONLINE);
 		chatroomBuddies[user].insert(frnd);
+	}
+}
 	if(errMsg.length()) {
 		handleMessage(user, adminLegacyName, errMsg, adminNickName);
 		return;
 	} if(twitterMode == SINGLECONTACT) {
 		handleMessage(user, adminLegacyName, std::string("You are not following ") + frnd + " anymore", adminNickName);
 	} else if(twitterMode == MULTIPLECONTACT) {
 		handleMessage(user, adminLegacyName, std::string("You are not following ") + frnd + " anymore", adminNickName);
+	}
 	handleMessage(user, adminLegacyName, std::string("You are not following ") + frnd + " anymore", adminNickName);
 	if(twitterMode == MULTIPLECONTACT) {
 		handleBuddyRemoved(user, frnd);
 	} else if (twitterMode == CHATROOM) {
 		handleParticipantChanged(user, frnd, adminLegacyName, 0, pbnetwork::STATUS_NONE);
 		chatroomBuddies[user].erase(frnd);
+	}
+}

backends/twitter/TwitterPlugin.h

➞

Show inline comments

@@ @@ -105,7 +105,7 @@ class TwitterPlugin : public NetworkPlugin { @@
 		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 directMessageResponse(std::string &user, std::string &username, 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);
 		void RetweetResponse(std::string &user, std::string &errMsg);
@@ @@ -134,6 +134,7 @@ class TwitterPlugin : public NetworkPlugin { @@
 		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> > chatroomBuddies;
 		mode twitterMode;
 };

0 comments (0 inline, 0 general)