Bot now posts to Tumblr

9 files changed, 92 insertions, 58 deletions

@@ -1,6 +1,6 @@
 [submodule "vendor/rawr-ebooks"]
         path = vendor/rawr-ebooks
         url = https://git.fourisland.com/rawr-ebooks
-[submodule "vendor/mastodonpp"]
-        path = vendor/mastodonpp
-        url = https://schlomp.space/tastytea/mastodonpp.git
+[submodule "vendor/liboauthcpp"]
+        path = vendor/liboauthcpp
+        url = https://github.com/sirikata/liboauthcpp.git
@@ -1,28 +1,36 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.27)
 project (sap)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
-find_package(FFMPEG REQUIRED)
+IF (NOT FFMPEG_FOUND)
+  find_package(FFMPEG)
+ENDIF()
 
 find_package(PkgConfig)
 pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
 pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)
 
+set(RAWR_ONLY_LIBRARY TRUE)
 add_subdirectory(vendor/rawr-ebooks EXCLUDE_FROM_ALL)
-add_subdirectory(vendor/mastodonpp)
+
+set(LIBOAUTHCPP_BUILD_DEMOS FALSE)
+add_subdirectory(vendor/liboauthcpp/build EXCLUDE_FROM_ALL)
+include_directories(vendor/liboauthcpp/include)
 
 include_directories(
   ${FFMPEG_INCLUDE_DIRS}
   vendor/rawr-ebooks
-  vendor/mastodonpp/include
+  vendor/liboauthcpp/include
+  ${CURL_INCLUDE_DIRS}
   vendor/json
   ${yaml-cpp_INCLUDE_DIRS}
   ${GraphicsMagick_INCLUDE_DIRS})
 
 link_directories(
   ${yaml-cpp_LIBRARY_DIRS}
-  ${GraphicsMagick_LIBRARY_DIRS})
+  ${GraphicsMagick_LIBRARY_DIRS}
+  ${FFMPEG_LIBRARY_DIRS})
 
 add_executable(sap sap.cpp director.cpp designer.cpp main.cpp)
 set_property(TARGET sap PROPERTY CXX_STANDARD 17)
@@ -30,7 +38,10 @@ set_property(TARGET sap PROPERTY CXX_STANDARD_REQUIRED ON)
 
 target_link_libraries(sap
   rawr
-  mastodonpp
-  ${FFMPEG_LIBRARIES}
+  curl
+  oauthcpp
+  avcodec
+  swscale
+  avformat
   ${GraphicsMagick_LIBRARIES}
   ${yaml-cpp_LIBRARIES})
@@ -51,7 +51,7 @@ namespace ffmpeg {
       format& fmt,
       AVStream* st)
     {
-      AVCodec* dec = avcodec_find_decoder(st->codecpar->codec_id);
+      const AVCodec* dec = avcodec_find_decoder(st->codecpar->codec_id);
       if (!dec)
       {
         throw ffmpeg_error("Failed to find codec");
@@ -10,7 +10,6 @@ extern "C" {
 int main(int argc, char** argv)
 {
   Magick::InitializeMagick(nullptr);
-  av_register_all();
 
   std::random_device randomDevice;
   std::mt19937 rng(randomDevice());
@@ -5,6 +5,7 @@
 #include <fstream>
 #include <iostream>
 #include <json.hpp>
+#include <curl/curl.h>
 
 /* - random frames from Spongebob (using ffmpeg)
  * with strange text overlaid, possibly rawr'd from
@@ -21,12 +22,12 @@ sap::sap(
   // Load the config file.
   YAML::Node config = YAML::LoadFile(configFile);
   tempfile_ = config["tempfile"].as<std::string>();
+  blog_name_ = config["blog_name"].as<std::string>();
 
-  // Set up the Mastodon client.
-  instance_ = std::make_unique<mastodonpp::Instance>(
-    config["mastodon_instance"].as<std::string>(),
-    config["mastodon_token"].as<std::string>());
-  connection_ = std::make_unique<mastodonpp::Connection>(*instance_);
+  // Set up the Tumblr client.
+  tumblr_consumer_ = std::make_unique<OAuth::Consumer>(config["consumer_key"].as<std::string>(), config["consumer_secret"].as<std::string>());
+  tumblr_token_ = std::make_unique<OAuth::Token>(config["access_token"].as<std::string>(), config["access_token_secret"].as<std::string>());
+  tumblr_client_ = std::make_unique<OAuth::Client>(tumblr_consumer_.get(), tumblr_token_.get());
 
   // Set up the text generator.
   for (const YAML::Node& corpusname : config["corpuses"])
@@ -72,22 +73,22 @@ void sap::run() const
 
       // Generate the text.
       std::uniform_int_distribution<size_t> lenDist(5, 19);
-      std::string action = kgramstats_.randomSentence(lenDist(rng_));
+      std::string action = kgramstats_.randomSentence(lenDist(rng_), rng_);
 
       // Lay the text on the video frame.
       Magick::Image textimage =
         layout_->generate(image.columns(), image.rows(), action, rng_);
       image.composite(textimage, 0, 0, Magick::OverCompositeOp);
 
-      // Send the tweet.
-      std::cout << "Sending tweet..." << std::endl;
+      // Post to tumblr.
+      std::cout << "Posting to Tumblr..." << std::endl;
 
-      sendTweet(std::move(image), action);
+      postToTumblr(action, std::move(image));
 
-      std::cout << "Tweeted!" << std::endl;
+      std::cout << std::endl << "Posted!" << std::endl;
 
       // Wait.
-      std::this_thread::sleep_for(std::chrono::hours(12));
+      std::this_thread::sleep_for(std::chrono::hours(11));
     } catch (const Magick::ErrorImage& ex)
     {
       std::cout << "Image error: " << ex.what() << std::endl;
@@ -97,42 +98,63 @@ void sap::run() const
   }
 }
 
-void sap::sendTweet(Magick::Image image, const std::string& text) const
+void sap::postToTumblr(const std::string& post_text, Magick::Image image) const
 {
   image.magick("jpeg");
   image.write(tempfile_);
 
-  auto answer{connection_->post(mastodonpp::API::v1::media,
-    {{"file", std::string("@file:") + tempfile_}, {"description", text}})};
-  if (!answer)
-  {
-    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;
-    }
-    return;
-  }
+  nlohmann::json jsonMedia;
+  jsonMedia["type"] = "image/jpeg";
+  jsonMedia["identifier"] = "some-identifier";
+  jsonMedia["width"] = image.columns();
+  jsonMedia["height"] = image.rows();
+  jsonMedia["alt_text"] = post_text;
+  jsonMedia["caption"] = post_text;
 
-  nlohmann::json response_json = nlohmann::json::parse(answer.body);
-  answer = connection_->post(mastodonpp::API::v1::statuses,
-    {{"status", ""}, {"media_ids",
-      std::vector<std::string_view>{response_json["id"].get<std::string>()}}});
+  nlohmann::json contentBlock;
+  contentBlock["type"] = "image";
+  contentBlock["media"] = jsonMedia;
 
-  if (!answer)
-  {
-    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;
-    }
+  nlohmann::json postBody;
+  postBody["content"].push_back(contentBlock);
+  postBody["tags"] = "spongebob,generated";
+
+  std::string postText = postBody.dump();
+  std::cout << postText << std::endl;
+
+  Magick::Blob blob;
+  image.write(&blob);
+
+  std::string url = "https://api.tumblr.com/v2/blog/" + blog_name_ + "/posts";
+
+  std::string oauthHeader = tumblr_client_->getFormattedHttpHeader(OAuth::Http::Post, url, "");
+
+  struct curl_slist* header_list = NULL;
+  header_list = curl_slist_append(header_list, oauthHeader.c_str());
+
+  CURL* easy = curl_easy_init();
+  curl_mime* mime = curl_mime_init(easy);
+  curl_mimepart* json_part = curl_mime_addpart(mime);
+  curl_mime_data(json_part, postText.c_str(), CURL_ZERO_TERMINATED);
+  curl_mime_name(json_part, "json");
+  curl_mime_type(json_part, "application/json");
+
+  curl_mimepart* image_part = curl_mime_addpart(mime);
+  curl_mime_data(image_part, reinterpret_cast<const char*>(blob.data()), blob.length());
+  curl_mime_name(image_part, "some-identifier");
+  curl_mime_type(image_part, "image/jpeg");
+  curl_mime_filename(image_part, "image.jpg");
+
+  curl_easy_setopt(easy, CURLOPT_MIMEPOST, mime);
+  curl_easy_setopt(easy, CURLOPT_HTTPHEADER, header_list);
+  curl_easy_setopt(easy, CURLOPT_URL, url.c_str());
+
+  CURLcode error = curl_easy_perform(easy);
+  if (error != CURLE_OK) {
+    std::cout << curl_easy_strerror(error) << std::endl;
   }
+
+  curl_easy_cleanup(easy);
+  curl_slist_free_all(header_list);
+  curl_mime_free(mime);
 }
@@ -5,7 +5,7 @@
 #include <string>
 #include <memory>
 #include <Magick++.h>
-#include <mastodonpp.hpp>
+#include <liboauthcpp/liboauthcpp.h>
 #include <rawr.h>
 #include "designer.h"
 #include "director.h"
@@ -21,15 +21,17 @@ public:
 
 private:
 
-  void sendTweet(Magick::Image image, const std::string& text) const;
+  void postToTumblr(const std::string& text, Magick::Image image) const;
 
   std::mt19937& rng_;
-  std::unique_ptr<mastodonpp::Instance> instance_;
-  std::unique_ptr<mastodonpp::Connection> connection_;
+  std::unique_ptr<OAuth::Consumer> tumblr_consumer_;
+  std::unique_ptr<OAuth::Token> tumblr_token_;
+  std::unique_ptr<OAuth::Client> tumblr_client_;
   rawr kgramstats_;
   std::unique_ptr<designer> layout_;
   std::unique_ptr<director> director_;
   std::string tempfile_;
+  std::string blog_name_;
 
 };
 
+Subproject 2893f1bf42e1dfd5acf0dd849519cf27ac9c739
-Subproject c48f1dc3d0566cef2baf96df7b3a7c55490a3e9
-Subproject 247ee4de24eab5ecd030542724db9f69aaa1ed1
+Subproject f4fe2a79e3ac9590c83886d208561b9f6ee4ebb