diff --git a/backends/twitter/Requests/FetchFriends.cpp b/backends/twitter/Requests/FetchFriends.cpp index 34afc10083390e93e4d69c47b4abb0f57b37b4b2..6f7030078c612f78d2fd14dbed60ef1bb7fe620d 100644 --- a/backends/twitter/Requests/FetchFriends.cpp +++ b/backends/twitter/Requests/FetchFriends.cpp @@ -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 IDs = getIDs( replyMsg ); - - twitObj->userLookup(IDs, true); - twitObj->getLastWebResponse( replyMsg ); + twitObj->getLastWebResponse( replyMsg ); + LOG4CXX_INFO(logger, user << " - " << replyMsg.length() << " " << replyMsg << "\n" ); + std::vector IDs = getIDs( replyMsg ); + + success = twitObj->userLookup(IDs, true); + if(!success) return; - LOG4CXX_INFO(logger, user << " - UserLookUp web response - " << replyMsg.length() << " " << replyMsg << "\n" ); - - std::vector 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); + } }