5 files changed, 51 insertions, 50 deletions

@@ -1,9 +1,9 @@
 [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
+[submodule "vendor/libtwittercpp"]
+        path = vendor/libtwittercpp
+        url = https://github.com/hatkirby/libtwittercpp
@@ -1,15 +1,12 @@
 cmake_minimum_required (VERSION 3.1)
 project (blessed)
 
-find_package(PkgConfig)
-pkg_check_modules(sqlite3 sqlite3 REQUIRED)
-
-add_subdirectory(vendor/twitcurl/libtwitcurl)
+add_subdirectory(vendor/libtwittercpp)
 add_subdirectory(vendor/verbly)
 add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
 
-include_directories(vendor/twitcurl/libtwitcurl ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/yaml-cpp/include)
+include_directories(vendor/libtwittercpp/src vendor/verbly/lib vendor/yaml-cpp/include)
 add_executable(blessed blessed.cpp)
 set_property(TARGET blessed PROPERTY CXX_STANDARD 11)
 set_property(TARGET blessed PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(blessed ${sqlite3_LIBRARIES} yaml-cpp twitcurl curl verbly)
+target_link_libraries(blessed twitter++ yaml-cpp verbly)
@@ -1,58 +1,60 @@
 #include <yaml-cpp/yaml.h>
 #include <iostream>
-#include <cstdlib>
-#include <ctime>
 #include <sstream>
-#include <twitcurl.h>
+#include <fstream>
 #include <verbly.h>
-#include <unistd.h>
+#include <twitter.h>
+#include <chrono>
+#include <random>
+#include <thread>
 
 int main(int argc, char** argv)
 {
-  srand(time(NULL));
+  std::random_device random_device;
+  std::mt19937 random_engine{random_device()};
   
   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"};
   
   std::vector<std::string> emojis;
-  std::ifstream emojifile("emojis.txt");
-  if (!emojifile.is_open())
-  {
-    std::cout << "Could not find emoji." << std::endl;
-    return -1;
-  }
-
-  for (;;)
   {
-    std::string line;
-    if (!getline(emojifile, line))
+    std::ifstream emojifile("emojis.txt");
+    if (!emojifile.is_open())
     {
-      break;
+      std::cout << "Could not find emoji." << std::endl;
+      return -1;
     }
-  
-    if (line.back() == '\r')
+
+    std::string line;
+    while (getline(emojifile, line))
     {
-      line.pop_back();
-    }
+      if (line.back() == '\r')
+      {
+        line.pop_back();
+      }
     
-    emojis.push_back(line);
+      emojis.push_back(line);
+    }
   }
   
-  emojifile.close();
+  std::uniform_int_distribution<int> emojidist(0, emojis.size()-1);
+  std::bernoulli_distribution continuedist(1.0/2.0);
   
   for (;;)
   {
-    std::cout << "Generating tweet" << std::endl;
+    std::cout << "Generating tweet..." << std::endl;
     
     std::string exclamation;
-    for (;;)
+    while (exclamation.empty())
     {
       verbly::verb v = database.verbs().random().limit(1).has_pronunciation().run().front();
       auto rhyms = database.nouns().rhymes_with(v).random().limit(1).is_not_proper().run();
@@ -62,7 +64,6 @@ int main(int argc, char** argv)
         if (n.base_form() != v.base_form())
         {
           exclamation = "god " + v.base_form() + " this " + n.base_form();
-          break;
         }
       }
     }
@@ -73,10 +74,10 @@ int main(int argc, char** argv)
     do
     {
       emn++;
-      std::string em = emojis[rand() % emojis.size()];
+      std::string em = emojis[emojidist(random_engine)];
       emojibef += em;
       emojiaft = em + emojiaft;
-    } while (rand() % 2 == 0);
+    } while (continuedist(random_engine));
     
     std::string result;
     if (emn > 3)
@@ -85,19 +86,22 @@ int main(int argc, char** argv)
     } else {
       result = emojibef + " " + exclamation + " " + emojiaft;
     }
+    
     result.resize(140);
+    std::cout << result << std::endl;
     
-    std::string replyMsg;
-    if (twitter.statusUpdate(result))
+    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);
+      
+      std::cout << "Tweeted!" << std::endl;
+    } catch (const twitter::twitter_error& e)
+    {
+      std::cout << "Twitter error: " << e.what() << std::endl;
     }
     
-    std::cout << "Waiting" << std::endl;
-    sleep(60 * 60);
+    std::cout << "Waiting..." << std::endl;
+    
+    std::this_thread::sleep_for(std::chrono::hours(1));
   }
 }
+Subproject d783c17151a98466e304b1e5f33bfca0be885fd
-Subproject 6659e86de7481e50977b7569c75138f7f69ad3c