Modernized bot structure

This improves readability, and also will display a nicer error message
for things such as the verbly datafile being invalid.

4 files changed, 85 insertions, 28 deletions

@@ -6,7 +6,7 @@ add_subdirectory(vendor/verbly)
 add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
 
 include_directories(vendor/libtwittercpp/src vendor/verbly/lib vendor/yaml-cpp/include)
-add_executable(fefisms fefisms.cpp)
+add_executable(fefisms fefisms.cpp main.cpp)
 set_property(TARGET fefisms PROPERTY CXX_STANDARD 11)
 set_property(TARGET fefisms PROPERTY CXX_STANDARD_REQUIRED ON)
 target_link_libraries(fefisms verbly twitter++ yaml-cpp)
@@ -1,41 +1,40 @@
-#include <verbly.h>
-#include <twitter.h>
+#include "fefisms.h"
 #include <yaml-cpp/yaml.h>
 #include <iostream>
 #include <chrono>
-#include <random>
 #include <thread>
 
-int main(int argc, char** argv)
+fefisms::fefisms(
+  std::string configFile,
+  std::mt19937& rng) :
+    rng_(rng)
 {
-  std::random_device random_device;
-  std::mt19937 random_engine{random_device()};
-  
-  if (argc != 2)
-  {
-    std::cout << "usage: fefisms [configfile]" << std::endl;
-    return -1;
-  }
+  // Load the config file.
+  YAML::Node config = YAML::LoadFile(configFile);
 
-  std::string configfile(argv[1]);
-  YAML::Node config = YAML::LoadFile(configfile);
+  // Set up the verbly database.
+  database_ = std::unique_ptr<verbly::database>(
+    new verbly::database(config["verbly_datafile"].as<std::string>()));
 
+  // Set up the Twitter client.
   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::database database(config["verbly_datafile"].as<std::string>());
+  client_ = std::unique_ptr<twitter::client>(new twitter::client(auth));
+}
 
+void fefisms::run() const
+{
   verbly::filter formFilter =
     (verbly::form::complexity == 1)
     && (verbly::form::proper == false);
-  
+
+  // Blacklist ethnic slurs
   verbly::filter cleanFilter =
-    !(verbly::word::usageDomains %= (verbly::notion::wnid == 106718862)); // Blacklist ethnic slurs
+    !(verbly::word::usageDomains %= (verbly::notion::wnid == 106718862));
 
   for (;;)
   {
@@ -45,18 +44,18 @@ int main(int argc, char** argv)
 
     verbly::inflection nounInfl = verbly::inflection::base;
     verbly::inflection hypoInfl = verbly::inflection::base;
-    
-    if (std::bernoulli_distribution(1.0/2.0)(random_engine))
+
+    if (std::bernoulli_distribution(1.0/2.0)(rng_))
     {
       hypoInfl = verbly::inflection::plural;
     }
 
-    if (std::bernoulli_distribution(1.0/2.0)(random_engine))
+    if (std::bernoulli_distribution(1.0/2.0)(rng_))
     {
       nounInfl = verbly::inflection::plural;
     }
 
-    verbly::word noun = database.words(
+    verbly::word noun = database_->words(
       (verbly::notion::partOfSpeech == verbly::part_of_speech::noun)
       && (verbly::word::forms(nounInfl) %= formFilter)
       && cleanFilter
@@ -64,13 +63,13 @@ int main(int argc, char** argv)
         (verbly::word::forms(hypoInfl) %= formFilter)
         && cleanFilter)).first();
 
-    verbly::word hyponym = database.words(
+    verbly::word hyponym = database_->words(
       (verbly::notion::partOfSpeech == verbly::part_of_speech::noun)
       && (verbly::notion::hypernyms %= noun)
       && cleanFilter
       && (verbly::word::forms(hypoInfl) %= formFilter)).first();
 
-    if (std::bernoulli_distribution(1.0/2.0)(random_engine))
+    if (std::bernoulli_distribution(1.0/2.0)(rng_))
     {
       utterance << verbly::token(noun, nounInfl);
       utterance << verbly::token(hyponym, hypoInfl);
@@ -86,7 +85,7 @@ int main(int argc, char** argv)
     {
       std::cout << "Tweeting..." << std::endl;
 
-      client.updateStatus(action);
+      client_->updateStatus(action);
 
       std::cout << "Success!" << std::endl;
       std::cout << "Waiting..." << std::endl;
@@ -100,4 +99,3 @@ int main(int argc, char** argv)
     std::cout << std::endl;
   }
 }
-
@@ -0,0 +1,28 @@
+#ifndef FEFISMS_H_09912EAE
+#define FEFISMS_H_09912EAE
+
+#include <random>
+#include <string>
+#include <verbly.h>
+#include <stdexcept>
+#include <memory>
+#include <twitter.h>
+
+class fefisms {
+public:
+
+  fefisms(
+    std::string configFile,
+    std::mt19937& rng);
+
+  void run() const;
+
+private:
+
+  std::mt19937& rng_;
+  std::unique_ptr<verbly::database> database_;
+  std::unique_ptr<twitter::client> client_;
+
+};
+
+#endif /* end of include guard: FEFISMS_H_09912EAE */
@@ -0,0 +1,31 @@
+#include "fefisms.h"
+
+int main(int argc, char** argv)
+{
+  std::random_device randomDevice;
+  std::mt19937 rng(randomDevice());
+
+  if (argc != 2)
+  {
+    std::cout << "usage: fefisms [configfile]" << std::endl;
+    return -1;
+  }
+
+  std::string configfile(argv[1]);
+
+  try
+  {
+    fefisms bot(configfile, rng);
+
+    try
+    {
+      bot.run();
+    } catch (const std::exception& ex)
+    {
+      std::cout << "Error running bot: " << ex.what() << std::endl;
+    }
+  } catch (const std::exception& ex)
+  {
+    std::cout << "Error initializing bot: " << ex.what() << std::endl;
+  }
+}