Merge branch 'master' of https://github.com/hanzz/libtransport into twitcurl_update

This commit is contained in:
vitalyster 2013-07-07 08:20:51 +00:00
commit a641f9cd9a
2 changed files with 6 additions and 6 deletions

View file

@ -76,8 +76,8 @@ TwitterPlugin::TwitterPlugin(Config *config, Swift::SimpleEventLoop *loop, Stora
tp = new ThreadPool(loop_, 10);
tweet_timer = m_factories->getTimerFactory()->createTimer(60000);
message_timer = m_factories->getTimerFactory()->createTimer(60000);
tweet_timer = m_factories->getTimerFactory()->createTimer(90000);
message_timer = m_factories->getTimerFactory()->createTimer(90000);
tweet_timer->onTick.connect(boost::bind(&TwitterPlugin::pollForTweets, this));
message_timer->onTick.connect(boost::bind(&TwitterPlugin::pollForDirectMessages, this));

View file

@ -50,9 +50,9 @@ EmbeddedStatus getEmbeddedStatus(const rapidjson::Value &element)
status.setTweet( unescape ( std::string( element[TwitterReponseTypes::text.c_str()].GetString() ) ) );
status.setTruncated( element[TwitterReponseTypes::truncated.c_str()].GetBool());
status.setReplyToStatusID( element[TwitterReponseTypes::in_reply_to_status_id.c_str()].IsNull() ?
"" : std::string(element[TwitterReponseTypes::in_reply_to_status_id.c_str()].GetString()) );
"" : std::to_string(element[TwitterReponseTypes::in_reply_to_status_id.c_str()].GetInt64()) );
status.setReplyToUserID( element[TwitterReponseTypes::in_reply_to_user_id.c_str()].IsNull() ?
"" : std::string(element[TwitterReponseTypes::in_reply_to_user_id.c_str()].GetString()) );
"" : std::to_string(element[TwitterReponseTypes::in_reply_to_user_id.c_str()].GetInt64()) );
status.setReplyToScreenName( element[TwitterReponseTypes::in_reply_to_screen_name.c_str()].IsNull() ?
"" : std::string(element[TwitterReponseTypes::in_reply_to_screen_name.c_str()].GetString()) );
status.setRetweetCount( element[TwitterReponseTypes::retweet_count.c_str()].GetInt64() );
@ -88,9 +88,9 @@ Status getStatus(const rapidjson::Value &element)
status.setTweet( unescape ( std::string( element[TwitterReponseTypes::text.c_str()].GetString() ) ) );
status.setTruncated( element[TwitterReponseTypes::truncated.c_str()].GetBool());
status.setReplyToStatusID( element[TwitterReponseTypes::in_reply_to_status_id.c_str()].IsNull() ?
"" : std::string(element[TwitterReponseTypes::in_reply_to_status_id.c_str()].GetString()) );
"" : std::to_string(element[TwitterReponseTypes::in_reply_to_status_id.c_str()].GetInt64()) );
status.setReplyToUserID( element[TwitterReponseTypes::in_reply_to_user_id.c_str()].IsNull() ?
"" : std::string(element[TwitterReponseTypes::in_reply_to_user_id.c_str()].GetString()) );
"" : std::to_string(element[TwitterReponseTypes::in_reply_to_user_id.c_str()].GetInt64()) );
status.setReplyToScreenName( element[TwitterReponseTypes::in_reply_to_screen_name.c_str()].IsNull() ?
"" : std::string(element[TwitterReponseTypes::in_reply_to_screen_name.c_str()].GetString()) );
status.setUserData( getUser(element[TwitterReponseTypes::user.c_str()]) );