7 files changed, 15 insertions, 28 deletions

@@ -4,3 +4,6 @@
 [submodule "vendor/curlcpp"]
         path = vendor/curlcpp
         url = https://github.com/JosephP91/curlcpp
+[submodule "vendor/hkutil"]
+        path = vendor/hkutil
+        url = git@github.com:hatkirby/hkutil
@@ -10,6 +10,8 @@ include_directories(vendor/liboauthcpp/include)
 add_subdirectory(vendor/curlcpp)
 include_directories(${CURLCPP_SOURCE_DIR}/include)
 
+include_directories(vendor/hkutil)
+
 add_library(twitter++
   src/client.cpp
   src/request.cpp
@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <json.hpp>
 #include <thread>
+#include <hkutil/string.h>
 #include "request.h"
 
 namespace twitter {
@@ -26,7 +27,7 @@ namespace twitter {
     if (!media_ids.empty())
     {
       datastrstream << "&media_ids=";
-      datastrstream << twitter::implode(std::begin(media_ids), std::end(media_ids), ",");
+      datastrstream << hatkirby::implode(std::begin(media_ids), std::end(media_ids), ",");
     }
 
     return tweet(
@@ -46,7 +47,7 @@ namespace twitter {
     if (!media_ids.empty())
     {
       datastrstream << "&media_ids=";
-      datastrstream << twitter::implode(std::begin(media_ids), std::end(media_ids), ",");
+      datastrstream << hatkirby::implode(std::begin(media_ids), std::end(media_ids), ",");
     }
 
     return tweet(
@@ -366,7 +367,8 @@ namespace twitter {
       }
 
       std::string datastr = "id=" +
-        OAuth::PercentEncode(implode(std::begin(cur), std::end(cur), ","));
+        OAuth::PercentEncode(
+          hatkirby::implode(std::begin(cur), std::end(cur), ","));
 
       std::string response =
         post(auth_,
@@ -399,7 +401,8 @@ namespace twitter {
       }
 
       std::string datastr = "user_id=" +
-        OAuth::PercentEncode(implode(std::begin(cur), std::end(cur), ","));
+        OAuth::PercentEncode(
+          hatkirby::implode(std::begin(cur), std::end(cur), ","));
 
       std::string response =
         post(auth_,
@@ -9,7 +9,6 @@
 #include "tweet.h"
 #include "auth.h"
 #include "configuration.h"
-#include "util.h"
 #include "timeline.h"
 
 namespace twitter {
@@ -1,8 +1,8 @@
 #include "timeline.h"
 #include <sstream>
 #include <json.hpp>
+#include <hkutil/string.h>
 #include "codes.h"
-#include "util.h"
 #include "request.h"
 
 namespace twitter {
@@ -40,7 +40,8 @@ namespace twitter {
       if (!arguments.empty())
       {
         urlstr << "?";
-        urlstr << implode(std::begin(arguments), std::end(arguments), "&");
+        urlstr << hatkirby::implode(
+          std::begin(arguments), std::end(arguments), "&");
       }
 
       std::string theUrl = urlstr.str();
@@ -1,31 +1,10 @@
 #ifndef UTIL_H_440DEAA0
 #define UTIL_H_440DEAA0
 
-#include <string>
-#include <sstream>
-#include <memory>
 #include <ctime>
 
 namespace twitter {
 
-  template <class InputIterator>
-  std::string implode(InputIterator first, InputIterator last, std::string delimiter)
-  {
-    std::stringstream result;
-
-    for (InputIterator it = first; it != last; it++)
-    {
-      if (it != first)
-      {
-        result << delimiter;
-      }
-
-      result << *it;
-    }
-
-    return result.str();
-  }
-
   time_t timegm(struct tm * t);
 
 };
+Subproject a9a5996310bb33207d3338f353aab97b9ed3a5e