1 files changed, 23 insertions, 345 deletions

@@ -2,342 +2,22 @@
 #include <sstream>
 #include <set>
 #include <algorithm>
-#include <liboauthcpp/liboauthcpp.h>
-#include <curl_easy.h>
-#include <curl_header.h>
 #include <json.hpp>
 #include <thread>
-
-// These are here for debugging curl stuff
-
-static
-void dump(const char *text,
-          FILE *stream, unsigned char *ptr, size_t size)
-{
-  size_t i;
-  size_t c;
-  unsigned int width=80;
-
-  fprintf(stream, "%s, %10.10ld bytes (0x%8.8lx)\n",
-          text, (long)size, (long)size);
-
-  for(i=0; i<size; i+= width) {
-    fprintf(stream, "%4.4lx: ", (long)i);
-
-    /* show hex to the left
-    for(c = 0; c < width; c++) {
-      if(i+c < size)
-        fprintf(stream, "%02x ", ptr[i+c]);
-      else
-        fputs("   ", stream);
-    }*/
-
-    /* show data on the right */
-    for(c = 0; (c < width) && (i+c < size); c++) {
-      char x = (ptr[i+c] >= 0x20 && ptr[i+c] < 0x80) ? ptr[i+c] : '.';
-      fputc(x, stream);
-    }
-
-    fputc('\n', stream); /* newline */
-  }
-}
-
-static
-int my_trace(CURL *handle, curl_infotype type,
-             char *data, size_t size,
-             void *userp)
-{
-  const char *text;
-  (void)handle; /* prevent compiler warning */
-
-  switch (type) {
-  case CURLINFO_TEXT:
-    fprintf(stderr, "== Info: %s", data);
-  default: /* in case a new one is introduced to shock us */
-    return 0;
-
-  case CURLINFO_HEADER_OUT:
-    text = "=> Send header";
-    break;
-  case CURLINFO_DATA_OUT:
-    text = "=> Send data";
-    break;
-  case CURLINFO_SSL_DATA_OUT:
-    text = "=> Send SSL data";
-    break;
-  case CURLINFO_HEADER_IN:
-    text = "<= Recv header";
-    break;
-  case CURLINFO_DATA_IN:
-    text = "<= Recv data";
-    break;
-  case CURLINFO_SSL_DATA_IN:
-    text = "<= Recv SSL data";
-    break;
-  }
-
-  dump(text, stderr, (unsigned char *)data, size);
-  return 0;
-}
+#include "request.h"
 
 namespace twitter {
 
-  class request
-  {
-  public:
-
-    explicit request(std::string url) try
-      : _ios(_output), _conn(_ios)
-    {
-      _conn.add<CURLOPT_URL>(url.c_str());
-    } catch (const curl::curl_easy_exception& error)
-    {
-      error.print_traceback();
-
-      assert(false);
-    }
-
-    std::string perform()
-    {
-      try
-      {
-        _conn.perform();
-      } catch (const curl::curl_easy_exception& error)
-      {
-        std::throw_with_nested(connection_error());
-      }
-
-      int response_code = _conn.get_info<CURLINFO_RESPONSE_CODE>().get();
-      std::string result = _output.str();
-
-      if (response_code / 100 != 2)
-      {
-        nlohmann::json response_json;
-
-        try
-        {
-          response_json = nlohmann::json::parse(result);
-        } catch (const std::invalid_argument& e)
-        {
-          std::throw_with_nested(invalid_response(result));
-        }
-
-        for (nlohmann::json& error : response_json["errors"])
-        {
-          int error_code;
-          std::string error_message;
-
-          try
-          {
-            error_code = error["code"].get<int>();
-            error_message = error["message"].get<std::string>();
-          } catch (const std::domain_error& e)
-          {
-            std::throw_with_nested(invalid_response(result));
-          }
-
-          switch (error_code)
-          {
-          case 32:
-          case 135:
-          case 215:
-            throw bad_auth(error_message);
-
-          case 44:
-            throw invalid_media(error_message);
-
-          case 64:
-            throw account_suspended(error_message);
-
-          case 88:
-            throw rate_limit_exceeded(error_message);
-
-          case 89:
-            throw bad_token(error_message);
-
-          case 130:
-            throw server_overloaded(error_message);
-
-          case 131:
-            throw server_error(error_message);
-
-          case 185:
-            throw update_limit_exceeded(error_message);
-
-          case 186:
-            throw bad_length(error_message);
-
-          case 187:
-            throw duplicate_status(error_message);
-
-          case 226:
-            throw suspected_spam(error_message);
-
-          case 261:
-            throw write_restricted(error_message);
-          }
-        }
-
-        if (response_code == 429)
-        {
-          throw rate_limit_exceeded("HTTP 429 Too Many Requests");
-        } else if (response_code == 500)
-        {
-          throw server_error("HTTP 500 Internal Server Error");
-        } else if (response_code == 502)
-        {
-          throw server_unavailable("HTTP 502 Bad Gateway");
-        } else if (response_code == 503)
-        {
-          throw server_overloaded("HTTP 503 Service Unavailable");
-        } else if (response_code == 504)
-        {
-          throw server_timeout("HTTP 504 Gateway Timeout");
-        }
-
-        throw unknown_error(response_code, result);
-      }
-
-      return result;
-    }
-
-  private:
-
-    std::ostringstream _output;
-    curl::curl_ios<std::ostringstream> _ios;
-
-  protected:
-
-    curl::curl_easy _conn;
-  };
-
-  class get : public request
-  {
-  public:
-
-    get(const OAuth::Client& oauth_client, std::string url) try
-      : request(url)
-    {
-      std::string oauth_header = oauth_client.getFormattedHttpHeader(OAuth::Http::Get, url, "");
-      if (!oauth_header.empty())
-      {
-        _headers.add(std::move(oauth_header));
-      }
-
-      _conn.add<CURLOPT_HTTPHEADER>(_headers.get());
-    } catch (const OAuth::ParseError& error)
-    {
-      std::cout << "Error generating OAuth header:" << std::endl;
-      std::cout << error.what() << std::endl;
-      std::cout << "This is likely due to a malformed URL." << std::endl;
-
-      assert(false);
-    } catch (const curl::curl_easy_exception& error)
-    {
-      error.print_traceback();
-
-      assert(false);
-    }
-
-  private:
-
-    curl::curl_header _headers;
-  };
-
-  class post : public request
-  {
-  public:
-
-    post(const OAuth::Client& oauth_client, std::string url, std::string datastr) try
-      : request(url)
-    {
-      std::string oauth_header = oauth_client.getFormattedHttpHeader(OAuth::Http::Post, url, datastr);
-      if (!oauth_header.empty())
-      {
-        _headers.add(std::move(oauth_header));
-      }
-
-      _conn.add<CURLOPT_HTTPHEADER>(_headers.get());
-      _conn.add<CURLOPT_COPYPOSTFIELDS>(datastr.c_str());
-    } catch (const OAuth::ParseError& error)
-    {
-      std::cout << "Error generating OAuth header:" << std::endl;
-      std::cout << error.what() << std::endl;
-      std::cout << "This is likely due to a malformed URL." << std::endl;
-
-      assert(false);
-    } catch (const curl::curl_easy_exception& error)
-    {
-      error.print_traceback();
-
-      assert(false);
-    }
-
-  private:
-
-    curl::curl_header _headers;
-  };
-
-  class multipost : public request
-  {
-  public:
-
-    multipost(const OAuth::Client& oauth_client, std::string url, const curl_httppost* fields) try
-      : request(url)
-    {
-      std::string oauth_header = oauth_client.getFormattedHttpHeader(OAuth::Http::Post, url, "");
-      if (!oauth_header.empty())
-      {
-        _headers.add(std::move(oauth_header));
-      }
-
-      _conn.add<CURLOPT_HTTPHEADER>(_headers.get());
-      _conn.add<CURLOPT_HTTPPOST>(fields);
-    } catch (const OAuth::ParseError& error)
-    {
-      std::cout << "Error generating OAuth header:" << std::endl;
-      std::cout << error.what() << std::endl;
-      std::cout << "This is likely due to a malformed URL." << std::endl;
-
-      assert(false);
-    } catch (const curl::curl_easy_exception& error)
-    {
-      error.print_traceback();
-
-      assert(false);
-    }
-
-  private:
-
-    curl::curl_header _headers;
-  };
-
-  client::client(const auth& _arg)
-  {
-    _oauth_consumer =
-      make_unique<OAuth::Consumer>(
-        _arg.getConsumerKey(),
-        _arg.getConsumerSecret());
-
-    _oauth_token =
-      make_unique<OAuth::Token>(
-        _arg.getAccessKey(),
-        _arg.getAccessSecret());
-
-    _oauth_client =
-      make_unique<OAuth::Client>(
-        _oauth_consumer.get(),
-        _oauth_token.get());
-
-    _current_user =
-      make_unique<user>(
-        get(*_oauth_client,
+  client::client(
+    const auth& _arg) :
+      auth_(_arg),
+      currentUser_(
+        get(auth_,
           "https://api.twitter.com/1.1/account/verify_credentials.json")
-        .perform());
+            .perform())
+  {
   }
 
-  client::~client() = default;
-
   tweet client::updateStatus(std::string msg, std::list<long> media_ids) const
   {
     std::stringstream datastrstream;
@@ -350,7 +30,7 @@ namespace twitter {
     }
 
     return tweet(
-      post(*_oauth_client,
+      post(auth_,
         "https://api.twitter.com/1.1/statuses/update.json",
         datastrstream.str())
       .perform());
@@ -370,7 +50,7 @@ namespace twitter {
     }
 
     return tweet(
-      post(*_oauth_client,
+      post(auth_,
         "https://api.twitter.com/1.1/statuses/update.json",
         datastrstream.str())
       .perform());
@@ -404,7 +84,7 @@ namespace twitter {
     }
 
     std::string init_response =
-      multipost(*_oauth_client,
+      multipost(auth_,
         "https://upload.twitter.com/1.1/media/upload.json",
         form.get())
       .perform();
@@ -435,7 +115,7 @@ namespace twitter {
       assert(false);
     }
 
-    multipost(*_oauth_client, "https://upload.twitter.com/1.1/media/upload.json", append_form_post).perform();
+    multipost(auth_, "https://upload.twitter.com/1.1/media/upload.json", append_form_post).perform();
 
     curl_formfree(append_form_post);
 
@@ -450,7 +130,7 @@ namespace twitter {
     finalize_form.add(media_id_name, media_id_cont);
 
     std::string finalize_response =
-      multipost(*_oauth_client,
+      multipost(auth_,
         "https://upload.twitter.com/1.1/media/upload.json",
         finalize_form.get())
       .perform();
@@ -472,7 +152,7 @@ namespace twitter {
 
       for (;;)
       {
-        std::string status_response = get(*_oauth_client, datastr.str()).perform();
+        std::string status_response = get(auth_, datastr.str()).perform();
 
         try
         {
@@ -499,9 +179,7 @@ namespace twitter {
     return media_id;
   } catch (const curl::curl_exception& error)
   {
-    error.print_traceback();
-
-    assert(false);
+    std::throw_with_nested(connection_error());
   }
 
   std::set<user_id> client::getFriends(user_id id) const
@@ -518,7 +196,7 @@ namespace twitter {
       urlstream << cursor;
 
       std::string url = urlstream.str();
-      std::string response_data = get(*_oauth_client, url).perform();
+      std::string response_data = get(auth_, url).perform();
 
       try
       {
@@ -562,7 +240,7 @@ namespace twitter {
       urlstream << cursor;
 
       std::string url = urlstream.str();
-      std::string response_data = get(*_oauth_client, url).perform();
+      std::string response_data = get(auth_, url).perform();
 
       try
       {
@@ -604,7 +282,7 @@ namespace twitter {
       urlstream << cursor;
 
       std::string url = urlstream.str();
-      std::string response_data = get(*_oauth_client, url).perform();
+      std::string response_data = get(auth_, url).perform();
 
       try
       {
@@ -630,7 +308,7 @@ namespace twitter {
     datastrstream << "follow=true&user_id=";
     datastrstream << toFollow;
 
-    post(*_oauth_client, "https://api.twitter.com/1.1/friendships/create.json", datastrstream.str()).perform();
+    post(auth_, "https://api.twitter.com/1.1/friendships/create.json", datastrstream.str()).perform();
   }
 
   void client::follow(const user& toFollow) const
@@ -644,7 +322,7 @@ namespace twitter {
     datastrstream << "user_id=";
     datastrstream << toUnfollow;
 
-    post(*_oauth_client, "https://api.twitter.com/1.1/friendships/destroy.json", datastrstream.str()).perform();
+    post(auth_, "https://api.twitter.com/1.1/friendships/destroy.json", datastrstream.str()).perform();
   }
 
   void client::unfollow(const user& toUnfollow) const
@@ -654,7 +332,7 @@ namespace twitter {
 
   const user& client::getUser() const
   {
-    return *_current_user;
+    return currentUser_;
   }
 
   const configuration& client::getConfiguration() const
@@ -662,8 +340,8 @@ namespace twitter {
     if (!_configuration || (difftime(time(NULL), _last_configuration_update) > 60*60*24))
     {
       _configuration =
-        make_unique<configuration>(
-          get(*_oauth_client,
+        std::make_unique<configuration>(
+          get(auth_,
             "https://api.twitter.com/1.1/help/configuration.json")
           .perform());