6 files changed, 23 insertions, 31 deletions

@@ -4,9 +4,6 @@
 [submodule "vendor/verbly"]
         path = vendor/verbly
         url = https://github.com/hatkirby/verbly
-[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
@@ -1,19 +1,13 @@
 cmake_minimum_required (VERSION 3.1)
 project (wordplay)
 
-find_package(PkgConfig)
-pkg_check_modules(sqlite3 sqlite3 REQUIRED)
-
-add_subdirectory(vendor/twitcurl/libtwitcurl)
-include_directories(vendor/twitcurl/libtwitcurl)
-
+add_subdirectory(vendor/libtwittercpp)
 add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
-include_directories(vendor/yaml-cpp/include)
-
 add_subdirectory(vendor/verbly)
-include_directories(vendor/verbly/lib)
+
+include_directories(vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include)
 
 add_executable(wordplay wordplay.cpp)
 set_property(TARGET wordplay PROPERTY CXX_STANDARD 11)
 set_property(TARGET wordplay PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(wordplay verbly ${sqlite3_LIBRARIES} yaml-cpp twitcurl curl)
+target_link_libraries(wordplay verbly twitter++ yaml-cpp)
+Subproject d783c17151a98466e304b1e5f33bfca0be885fd
-Subproject 6659e86de7481e50977b7569c75138f7f69ad3c
-Subproject e7299f7bf66df7e62bf36ef42ab7810086d088c
+Subproject 1f898f3bd66c29672275c2c884b17ba662ced62
@@ -3,21 +3,22 @@
 #include <iostream>
 #include <list>
 #include <algorithm>
-#include <twitcurl.h>
+#include <twitter.h>
 #include <verbly.h>
-#include <unistd.h>
+#include <chrono>
+#include <thread>
 
 int main(int argc, char** argv)
 {
-  srand(time(NULL));
-  
   YAML::Node config = YAML::LoadFile("config.yml");
     
-  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>());
+  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);
   
   verbly::data database("data.sqlite3");
   
@@ -71,18 +72,18 @@ int main(int argc, char** argv)
       result << "A " << rhmadj.base_form() << " " << rhmnoun.base_form() << "!" << std::endl;
     }
     
-    std::string replyMsg;
-    if (twitter.statusUpdate(result.str()))
+    try
     {
-      twitter.getLastWebResponse(replyMsg);
-      std::cout << "Twitter message: " << replyMsg << std::endl;
-    } else {
-      twitter.getLastCurlError(replyMsg);
-      std::cout << "Curl error: " << replyMsg << std::endl;
+      client.updateStatus(result.str());
+      
+      std::cout << "Tweeted!" << std::endl;
+    } catch (const twitter::twitter_error& e)
+    {
+      std::cout << "Twitter error: " << e.what() << std::endl;
     }
 
-    std::cout << "Waiting" << std::endl;
+    std::cout << "Waiting..." << std::endl;
     
-    sleep(60 * 60);
+    std::this_thread::sleep_for(std::chrono::hours(1));
   }
 }