stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Populating user's roster

Browse source
This commit is contained in:
Sarang Bharadwaj 2012-06-10 21:39:29 +05:30
parent 1815ef0c74
commit 5b13c80ee9
7 changed files with 131 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
backends/twitter/Requests/FetchFriends.cpp
View file

@ -4,45 +4,31 @@ DEFINE_LOGGER(logger, "FetchFriends")
void FetchFriends::run()
{
replyMsg = "";
if( twitObj->friendsIdsGet(twitObj->getTwitterUsername())) {
while(replyMsg.length() == 0) {
twitObj->getLastWebResponse( replyMsg );
}
LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
success = twitObj->friendsIdsGet(twitObj->getTwitterUsername());
if(!success) return;
std::vector<std::string> IDs = getIDs( replyMsg );
twitObj->userLookup(IDs, true);
twitObj->getLastWebResponse( replyMsg );
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;
LOG4CXX_INFO(logger, user << " - UserLookUp web response - " << replyMsg.length() << " " << replyMsg << "\n" );
std::vector<User> users = getUsers( replyMsg );
userlist = "\n***************USER LIST****************\n";
for(int i=0 ; i < users.size() ; i++) {
userlist += "*)" + users[i].getUserName() + " (" + users[i].getScreenName() + ")\n";
}
userlist += "***************************************\n";
}
twitObj->getLastWebResponse( replyMsg );
LOG4CXX_INFO(logger, user << " - UserLookUp web response - " << replyMsg.length() << " " << replyMsg << "\n" );
friends = getUsers( replyMsg );
}
void FetchFriends::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, user << ": " << userlist);
np->handleMessage(user, "twitter-account", userlist);
}
} else {
if(!success) {
twitObj->getLastCurlError( replyMsg );
LOG4CXX_INFO(logger, user << " - friendsIdsGet error - " << 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);
}
}

14
backends/twitter/Requests/FetchFriends.h
View file

@ -4,9 +4,11 @@
#include "../ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "../TwitterResponseParser.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include <string>
#include <boost/signals.hpp>
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include <iostream>
using namespace Transport;
@ -16,14 +18,16 @@ class FetchFriends : public Thread
twitCurl *twitObj;
std::string user;
std::string replyMsg;
std::string userlist;
NetworkPlugin *np;
std::vector<User> friends;
bool success;
boost::function< void (std::string, std::vector<User> &, std::string) > callBack;
public:
FetchFriends(NetworkPlugin *_np, twitCurl *obj, const std::string &_user) {
FetchFriends(twitCurl *obj, const std::string &_user,
boost::function< void (std::string, std::vector<User> &, std::string) > cb) {
twitObj = obj->clone();
np = _np;
user = _user;
callBack = cb;
}
~FetchFriends() {

50
backends/twitter/Requests/TimelineRequest.cpp
View file

@ -2,47 +2,31 @@
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 = "";
if(success) {
LOG4CXX_INFO(logger, "Sending timeline request for user " << user)
twitObj->getLastWebResponse( replyMsg );
while(replyMsg.length() == 0) {
twitObj->getLastWebResponse( replyMsg );
}
LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
std::vector<Status> tweets = getTimeline(replyMsg);
timeline = "";
if(tweets.size() && (since_id == "" ||
(since_id != "" && tweets[0].getID() != np->getMostRecentTweetID(user)) )) {
for(int i=0 ; i<tweets.size() ; i++) {
timeline += tweets[i].getTweet() + "\n";
}
np->updateUsersLastTweetID(user, tweets[0].getID());
}
}
LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" );
tweets = getTimeline(replyMsg);
}
void TimelineRequest::finalize()
{
if(success && timeline != "") {
std::string error = getErrorMessage(replyMsg);
if(error.length()) {
np->handleMessage(user, "twitter-account", error);
LOG4CXX_INFO(logger, user << ": " << error);
} else {
LOG4CXX_INFO(logger, user << "'s timeline\n" << replyMsg);
np->handleMessage(user, "twitter-account", timeline); //send timeline
}
}
else {
if(!success) {
twitObj->getLastCurlError( replyMsg );
LOG4CXX_ERROR(logger, user << " - " << replyMsg );
}
LOG4CXX_ERROR(logger, user << " - " << 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);
}
}

12
backends/twitter/Requests/TimelineRequest.h
View file

@ -4,11 +4,10 @@
#include "../ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "../TwitterResponseParser.h"
#include "transport/networkplugin.h"
#include "../TwitterPlugin.h"
#include "transport/logging.h"
#include <string>
#include <iostream>
#include <boost/function.hpp>
using namespace Transport;
@ -18,18 +17,19 @@ class TimelineRequest : public Thread
std::string user;
std::string userRequested;
std::string replyMsg;
std::string timeline;
std::string since_id;
TwitterPlugin *np;
bool success;
boost::function< void (std::string&, std::string&, std::vector<Status> &, std::string&) > callBack;
std::vector<Status> tweets;
public:
TimelineRequest(TwitterPlugin *_np, twitCurl *obj, const std::string &_user, const std::string &_user2, const std::string &_since_id) {
TimelineRequest(twitCurl *obj, const std::string &_user, const std::string &_user2, const std::string &_since_id,
boost::function< void (std::string&, std::string&, std::vector<Status> &, std::string&) > cb) {
twitObj = obj->clone();
np = _np;
user = _user;
userRequested = _user2;
since_id = _since_id;
callBack = cb;
}
~TimelineRequest() {

75
backends/twitter/TwitterPlugin.cpp
View file

@ -21,6 +21,13 @@ TwitterPlugin::TwitterPlugin(Config *config, Swift::SimpleEventLoop *loop, Stora
LOG4CXX_ERROR(logger, "Couldn't find consumer key and/or secret. Please check config file.");
exit(0);
}
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");
consumerKey = CONFIG_STRING(config, "twitter.consumer_key");
consumerSecret = CONFIG_STRING(config, "twitter.consumer_secret");
OAUTH_KEY = "oauth_key";
@ -108,7 +115,7 @@ void TwitterPlugin::handleMessageSendRequest(const std::string &user, const std:
if(legacyName == "twitter-account") {
char ch;
//char ch;
std::string cmd = "", data = "";
int i;
@ -125,8 +132,10 @@ void TwitterPlugin::handleMessageSendRequest(const std::string &user, const std:
tp->runAsThread(new DirectMessageRequest(np, sessions[user], user, username, data));
}
else if(cmd == "#status") tp->runAsThread(new StatusUpdateRequest(np, sessions[user], user, data));
else if(cmd == "#timeline") tp->runAsThread(new TimelineRequest(np, sessions[user], user, data, ""));
else if(cmd == "#friends") tp->runAsThread(new FetchFriends(np, sessions[user], user));
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 handleMessage(user, "twitter-account", "Unknown command! Type #help for a list of available commands.");
}
}
@ -149,7 +158,8 @@ void TwitterPlugin::pollForTweets()
std::set<std::string>::iterator it = onlineUsers.begin();
while(it != onlineUsers.end()) {
std::string user = *it;
tp->runAsThread(new TimelineRequest(np, sessions[user], user, "", mostRecentTweetID[user]));
tp->runAsThread(new TimelineRequest(sessions[user], user, "", mostRecentTweetID[user],
boost::bind(&TwitterPlugin::displayTweets, this, _1, _2, _3, _4)));
it++;
}
m_timer->start();
@ -240,6 +250,12 @@ void TwitterPlugin::pinExchangeComplete(const std::string user, const std::strin
sessions[user]->getOAuth().setOAuthTokenKey( OAuthAccessTokenKey );
sessions[user]->getOAuth().setOAuthTokenSecret( OAuthAccessTokenSecret );
connectionState[user] = CONNECTED;
if(twitterMode == MULTIPLECONTACT) {
tp->runAsThread(new FetchFriends(sessions[user], user,
boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3)));
}
onlineUsers.insert(user);
mostRecentTweetID[user] = "";
}
@ -253,5 +269,54 @@ void TwitterPlugin::updateUsersLastTweetID(const std::string user, const std::st
std::string TwitterPlugin::getMostRecentTweetID(const std::string user)
{
boost::mutex::scoped_lock lock(userlock);
return mostRecentTweetID[user];
std::string ID = "-1";
if(onlineUsers.count(user)) ID = mostRecentTweetID[user];
return ID;
}
/************************************** Twitter response functions **********************************/
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++) {
handleBuddyChanged(user, friends[i].getUserName(), friends[i].getScreenName(), std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
}
} else handleMessage(user, "twitter-account", std::string("Error populating roster - ") + errMsg);
}
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);
}
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++) {
timeline += " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + "\n";
}
if((userRequested == "" || userRequested == user) && tweets.size()) {
std::string tweetID = getMostRecentTweetID(user);
if(tweetID != tweets[0].getID()) updateUsersLastTweetID(user, tweets[0].getID());
else timeline = ""; //have already sent the tweet earlier
}
if(timeline.length()) handleMessage(user, "twitter-account", timeline);
} else handleMessage(user, "twitter-account", errMsg);
}

10
backends/twitter/TwitterPlugin.h
View file

@ -88,9 +88,16 @@ class TwitterPlugin : public NetworkPlugin {
std::string getMostRecentTweetID(const std::string user);
/****************** Twitter Response handlers **************************************/
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);
/***********************************************************************************/
private:
enum status {NEW, WAITING_FOR_PIN, CONNECTED, DISCONNECTED};
enum mode {SINGLECONTACT, MULTIPLECONTACT, CHATROOM};
Config *config;
std::string consumerKey;
@ -105,6 +112,7 @@ class TwitterPlugin : public NetworkPlugin {
std::map<std::string, status> connectionState;
std::map<std::string, std::string> mostRecentTweetID;
std::set<std::string> onlineUsers;
mode twitterMode;
};
#endif

1
src/config.cpp
View file

@ -122,6 +122,7 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
("backend.no_vcard_fetch", value<bool>()->default_value(false), "True if VCards for buddies should not be fetched. Only avatars will be forwarded.")
("twitter.consumer_key", value<std::string>()->default_value(""), "Twitter APP Consumer Key.")
("twitter.consumer_secret", value<std::string>()->default_value(""), "Twitter APP Consumer Secret")
("twitter.mode", value<int>()->default_value(0), "Twitter mode")
("proxy.server", value<std::string>()->default_value("localhost"), "Proxy IP.")
("proxy.user", value<std::string>()->default_value(""), "Proxy user.")
("proxy.password", value<std::string>()->default_value(""), "Proxy Password.")