4 files changed, 16 insertions, 7 deletions

@@ -8,12 +8,11 @@ add_subdirectory(vendor/verbly)
 add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
 
 find_package(PkgConfig)
-pkg_check_modules(sqlite3 sqlite3>=3.8.3 REQUIRED)
 pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)
 
-include_directories(${GraphicsMagick_INCLUDE_DIRS} ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/libtwittercpp/vendor/json/src vendor/libtwittercpp/vendor/curlcpp/include)
-link_directories(${sqlite3_LIBRARY_DIRS} ${GraphicsMagick_LIBRARY_DIRS})
+include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include)
+link_directories(${GraphicsMagick_LIBRARY_DIRS})
 add_executable(infinite infinite.cpp color.cpp fractal.cpp matrix3x3.cpp vector3d.cpp tinyxml2.cpp triangle.cpp)
 set_property(TARGET infinite PROPERTY CXX_STANDARD 11)
 set_property(TARGET infinite PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(infinite ${GraphicsMagick_LIBRARIES} verbly ${sqlite3_LIBRARIES} yaml-cpp twitter++ curlcpp)
+target_link_libraries(infinite ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++)
@@ -733,10 +733,11 @@ int main(int argc, char** argv)
   
     closedir(fontdir);
     
+    std::string subaction = action;
     std::string font = fonts[rand() % fonts.size()];
     if (font == "Le_Super_Type_SemiBold.ttf")
     {
-      std::transform(std::begin(action), std::end(action), std::begin(action), [] (char ch) {
+      std::transform(std::begin(subaction), std::end(subaction), std::begin(subaction), [] (char ch) {
         return std::toupper(ch);
       });
     }
@@ -747,7 +748,7 @@ int main(int argc, char** argv)
     textimage.fontPointsize(72.0);
     textimage.font("fonts/" + font);
   
-    auto words = verbly::split<std::list<std::string>>(action, " ");
+    auto words = verbly::split<std::list<std::string>>(subaction, " ");
     std::string towrite = "";
     std::string curline = "";
     Magick::TypeMetric metric;
@@ -788,8 +789,17 @@ int main(int argc, char** argv)
       continue;
     }
     
+    std::string tweetText;
+    size_t tweetLim = 140 - client.getConfiguration().getCharactersReservedPerMedia() - 2;
+    if (action.length() > tweetLim)
+    {
+      tweetText = "\"" + action.substr(0, tweetLim - 1) + "…\"";
+    } else {
+      tweetText = "\"" + action + "\"";
+    }
+    
     twitter::tweet tw;
-    resp = client.updateStatus("", tw, {media_id});
+    resp = client.updateStatus(tweetText, tw, twitter::tweet(), {media_id});
     if (resp != twitter::response::ok)
     {
       std::cout << "Twitter error while tweeting: " << resp << std::endl;
-Subproject f465dce27cf0f07039e29d8975ad98939f0df3a
+Subproject aceb3cc33ee78cce1077252aff8a8808a3195ff
-Subproject e7299f7bf66df7e62bf36ef42ab7810086d088c
+Subproject 6c2aca03c89b37e136ab4c7ea58b485dadc85bc