2 files changed, 25 insertions, 19 deletions

@@ -3,16 +3,20 @@ project (wordplay)
 
 find_package(PkgConfig)
 pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
+pkg_check_modules(mastodonpp mastodonpp REQUIRED)
 
-add_subdirectory(vendor/libtwittercpp)
 add_subdirectory(vendor/verbly)
 
 include_directories(
   vendor/verbly/lib
-  vendor/libtwittercpp/src
+  ${mastodonpp_INCLUDE_DIRS}
   ${yaml-cpp_INCLUDE_DIRS})
 
+link_directories(
+  ${mastodonpp_LIBRARY_DIRS}
+  ${yaml-cpp_LIBRARY_DIRS})
+
 add_executable(wordplay wordplay.cpp)
-set_property(TARGET wordplay PROPERTY CXX_STANDARD 11)
+set_property(TARGET wordplay PROPERTY CXX_STANDARD 17)
 set_property(TARGET wordplay PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(wordplay verbly twitter++ ${yaml-cpp_LIBRARIES})
+target_link_libraries(wordplay verbly ${mastodonpp_LIBRARIES} ${yaml-cpp_LIBRARIES})
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <list>
 #include <algorithm>
-#include <twitter.h>
+#include <mastodonpp/mastodonpp.hpp>
 #include <verbly.h>
 #include <chrono>
 #include <thread>
@@ -19,13 +19,10 @@ int main(int argc, char** argv)
   std::string configfile(argv[1]);
   YAML::Node config = YAML::LoadFile(configfile);
 
-  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);
+  mastodonpp::Instance instance{
+    config["mastodon_instance"].as<std::string>(),
+    config["mastodon_token"].as<std::string>()};
+  mastodonpp::Connection connection{instance};
 
   verbly::database database(config["verbly_datafile"].as<std::string>());
 
@@ -75,14 +72,19 @@ int main(int argc, char** argv)
     std::string result = action.compile();
     std::cout << result << std::endl;
 
-    try
-    {
-      client.updateStatus(result);
-
-      std::cout << "Tweeted!" << std::endl;
-    } catch (const twitter::twitter_error& e)
+    const mastodonpp::parametermap parameters{{"status", result}};
+    auto answer{connection.post(mastodonpp::API::v1::statuses, parameters)};
+    if (!answer)
     {
-      std::cout << "Twitter error: " << e.what() << std::endl;
+      if (answer.curl_error_code == 0)
+      {
+        std::cout << "HTTP status: " << answer.http_status << std::endl;
+      }
+      else
+      {
+        std::cout << "libcurl error " << std::to_string(answer.curl_error_code)
+             << ": " << answer.error_message << std::endl;
+      }
     }
 
     std::cout << "Waiting..." << std::endl;