5 files changed, 72 insertions, 40 deletions

@@ -1,6 +1,6 @@
-[submodule "vendor/twitcurl"]
-        path = vendor/twitcurl
-        url = https://github.com/swatkat/twitcurl
 [submodule "vendor/yaml-cpp"]
         path = vendor/yaml-cpp
         url = https://github.com/jbeder/yaml-cpp
+[submodule "vendor/libtwittercpp"]
+        path = vendor/libtwittercpp
+        url = https://github.com/hatkirby/libtwittercpp
@@ -1,25 +1,23 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 project (rawr-ebooks)
 
-find_package(PkgConfig)
-pkg_check_modules(Curl libcurl)
+set(CMAKE_BUILD_TYPE Debug)
 
-if (Curl_FOUND)
-  add_subdirectory(vendor/twitcurl/libtwitcurl)
-  include_directories(vendor/twitcurl/libtwitcurl)
-  
-  add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
-  include_directories(vendor/yaml-cpp/include)
-  
-  add_executable(rawr-ebooks ebooks.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp)
-  set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11)
-  set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON)
-  target_link_libraries(rawr-ebooks yaml-cpp twitcurl ${Curl_LIBRARIES} aspell)
-else (Curl_FOUND)
-  message(STATUS "rawr-ebooks requires yaml-cpp and twitcurl; without these, we will only make rawr-gen")
-endif (Curl_FOUND)
+add_subdirectory(vendor/libtwittercpp)
+include_directories(vendor/libtwittercpp/src vendor/libtwittercpp/vendor/json/src vendor/libtwittercpp/vendor/curlcpp/include)
+
+add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
+include_directories(vendor/yaml-cpp/include)
+
+find_package(aspell REQUIRED)
+include_directories(${ASPELL_INCLUDE_DIR})
+
+add_executable(rawr-ebooks ebooks.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp)
+set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11)
+set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON)
+target_link_libraries(rawr-ebooks yaml-cpp twitter++ curlcpp curl ${ASPELL_LIBRARIES} pthread)
 
 add_executable(rawr-gen gen.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp)
 set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11)
 set_property(TARGET rawr-gen PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(rawr-gen aspell)
+target_link_libraries(rawr-gen ${ASPELL_LIBRARIES})
@@ -3,20 +3,29 @@
 #include <map>
 #include "kgramstats.h"
 #include <ctime>
-#include <vector>
 #include <cstdlib>
 #include <fstream>
 #include <iostream>
-#include <twitcurl.h>
-#include <unistd.h>
+#include <twitter.h>
 #include <yaml-cpp/yaml.h>
+#include <thread>
+#include <chrono>
 
 int main(int argc, char** args)
 {
   srand(time(NULL));
+  rand(); rand(); rand(); rand();
         
   YAML::Node config = YAML::LoadFile("config.yml");
   int delay = config["delay"].as<int>();
+  
+  twitter::auth auth;
+  auth.setConsumerKey(config["consumer_key"].as<std::string>());
+  auth.setConsumerSecret(config["consumer_secret"].as<std::string>());
+  auth.setAccessKey(config["access_key"].as<std::string>());
+  auth.setAccessSecret(config["access_secret"].as<std::string>());
+  
+  twitter::client client(auth);
 
   std::ifstream infile(config["corpus"].as<std::string>().c_str());
   std::string corpus;
@@ -33,28 +42,53 @@ int main(int argc, char** args)
 
   std::cout << "Preprocessing corpus..." << std::endl;
   kgramstats* stats = new kgramstats(corpus, 4);
+  std::mutex stats_mutex;
+  
+  client.setUserStreamNotifyCallback([&] (twitter::notification n) {
+    if (n.getType() == twitter::notification::type::tweet)
+    {
+      std::string original = n.getTweet().getText();
+      std::string canonical;
+      std::transform(std::begin(original), std::end(original), std::back_inserter(canonical), [] (char ch) {
+        return std::tolower(ch);
+      });
+      
+      if (canonical.find("@rawr_ebooks") != std::string::npos)
+      {
+        std::string doc = "@" + n.getTweet().getAuthor().getScreenName() + " ";
+        {
+          std::lock_guard<std::mutex> stats_lock(stats_mutex);
+          doc += stats->randomSentence(140 - doc.length());
+        }
+        
+        twitter::tweet tw;
+        twitter::response resp = client.updateStatus(doc, tw, n.getTweet());
+        if (resp != twitter::response::ok)
+        {
+          std::cout << "Twitter error while tweeting: " << resp << std::endl;
+        }
+      }
+    }
+  });
   
-  twitCurl twitter;
-  twitter.getOAuth().setConsumerKey(config["consumer_key"].as<std::string>());
-  twitter.getOAuth().setConsumerSecret(config["consumer_secret"].as<std::string>());
-  twitter.getOAuth().setOAuthTokenKey(config["access_key"].as<std::string>());
-  twitter.getOAuth().setOAuthTokenSecret(config["access_secret"].as<std::string>());
+  client.startUserStream();
+  std::this_thread::sleep_for(std::chrono::minutes(1));
 
   std::cout << "Generating..." << std::endl;
   for (;;)
   {
-    std::string doc = stats->randomSentence(140);
-    std::string hi = doc;
-    hi.resize(140);
+    std::string doc;
+    {
+      std::lock_guard<std::mutex> stats_lock(stats_mutex);
+      doc = stats->randomSentence(140);
+    }
+    doc.resize(140);
     
-    std::string replyMsg;
-    if (twitter.statusUpdate(hi))
+    twitter::tweet tw;
+    twitter::response resp = client.updateStatus(doc, tw);
+    if (resp != twitter::response::ok)
     {
-      twitter.getLastWebResponse(replyMsg);
-      std::cout << "Twitter message: " << replyMsg << std::endl;
-    } else {
-      twitter.getLastCurlError(replyMsg);
-      std::cout << "Curl error: " << replyMsg << std::endl;
+      std::cout << "Twitter error while tweeting: " << resp << std::endl;
     }
     
     int waitlen = rand() % delay;
@@ -86,7 +120,7 @@ int main(int argc, char** args)
       std::cout << "Sleeping for " << (waitlen/60/60/24) << " days..." << std::endl;
     }
 
-    sleep(waitlen);
+    std::this_thread::sleep_for(std::chrono::seconds(waitlen));
   }
         
   return 0;
+Subproject 77b6ba9a45714b0b91b9ad782877bce5ca92a25
-Subproject 6659e86de7481e50977b7569c75138f7f69ad3c