diff --git a/src/cocoatweet/api/favorite/create.cc b/src/cocoatweet/api/favorite/create.cc index ece7181..1d4cc83 100644 --- a/src/cocoatweet/api/favorite/create.cc +++ b/src/cocoatweet/api/favorite/create.cc @@ -1,5 +1,5 @@ #include -#include + namespace CocoaTweet::API::Favorites { Create::Create() { contentType_ = "application/x-www-form-urlencoded"; @@ -12,7 +12,6 @@ void Create::id(const std::string& _id) { void Create::process(std::weak_ptr _oauth) { HttpPost::process(_oauth, [](const unsigned int _, const std::string& _srv) { - std::cout << _srv << std::endl; }); } } // namespace CocoaTweet::API::Favorites diff --git a/src/cocoatweet/api/favorite/destroy.cc b/src/cocoatweet/api/favorite/destroy.cc index dac36fa..23d4a6d 100644 --- a/src/cocoatweet/api/favorite/destroy.cc +++ b/src/cocoatweet/api/favorite/destroy.cc @@ -1,5 +1,5 @@ #include -#include + namespace CocoaTweet::API::Favorites { Destroy::Destroy() { contentType_ = "application/x-www-form-urlencoded"; @@ -12,7 +12,6 @@ void Destroy::id(const std::string& _id) { void Destroy::process(std::weak_ptr _oauth) { HttpPost::process(_oauth, [](const unsigned int _, const std::string& _srv) { - std::cout << _srv << std::endl; }); } } // namespace CocoaTweet::API::Favorites diff --git a/src/cocoatweet/api/favorite/favorite.cc b/src/cocoatweet/api/favorite/favorite.cc index 6bdb88d..99c0898 100644 --- a/src/cocoatweet/api/favorite/favorite.cc +++ b/src/cocoatweet/api/favorite/favorite.cc @@ -1,5 +1,3 @@ -#include - #include "cocoatweet/api/favorite/favorite.h" #include "cocoatweet/api/favorite/create.h" #include "cocoatweet/api/favorite/destroy.h" diff --git a/src/cocoatweet/api/interface/httpPost.cc b/src/cocoatweet/api/interface/httpPost.cc index d320ce3..96d355c 100644 --- a/src/cocoatweet/api/interface/httpPost.cc +++ b/src/cocoatweet/api/interface/httpPost.cc @@ -4,7 +4,7 @@ #include #include #include -#include +#include extern "C" { #include } @@ -31,7 +31,6 @@ void HttpPost::process(std::weak_ptr _oauth, auto signature = oauth->signature(sigingParam, "POST", url_); // 作成した署名をエンドポイントへのパラメータ及びOAuthパラメータに登録 - std::cout << "signature : " << signature["oauth_signature"] << std::endl; oauthParam.merge(signature); // リクエストボディの構築 @@ -43,7 +42,6 @@ void HttpPost::process(std::weak_ptr _oauth, } requestBody = CocoaTweet::Util::join(tmp, "&"); } - std::cout << "request Body -> " << requestBody << std::endl; // ヘッダの構築 std::string oauthHeader = "authorization: OAuth "; @@ -54,7 +52,6 @@ void HttpPost::process(std::weak_ptr _oauth, } oauthHeader += CocoaTweet::Util::join(tmp, ","); } - std::cout << "OAuth Header -> " << oauthHeader << std::endl; // do post CURL* curl; @@ -63,7 +60,6 @@ void HttpPost::process(std::weak_ptr _oauth, long responseCode; curl = curl_easy_init(); url_ = url_; - std::cout << "URL : " << url_ << std::endl; if (curl) { curl_easy_setopt(curl, CURLOPT_URL, url_.c_str()); curl_easy_setopt(curl, CURLOPT_POST, 1); @@ -71,7 +67,9 @@ void HttpPost::process(std::weak_ptr _oauth, curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, requestBody.length()); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlCallback_); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (std::string*)&rcv); +#ifndef NDEBUG curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); +#endif // Headerを保持するcurl_slist*を初期化 struct curl_slist* headers = NULL; // Authorizationをヘッダに追加 @@ -83,7 +81,7 @@ void HttpPost::process(std::weak_ptr _oauth, } if (res != CURLE_OK) { - std::cout << "curl error : " << res << std::endl; + throw std::runtime_error(std::string("INTERNAL ERROR : curl(") + std::to_string(res) + ")"); exit(1); } diff --git a/src/cocoatweet/api/model/tweet.cc b/src/cocoatweet/api/model/tweet.cc index 5eb782a..0f617ce 100644 --- a/src/cocoatweet/api/model/tweet.cc +++ b/src/cocoatweet/api/model/tweet.cc @@ -6,8 +6,6 @@ #include #include "nlohmann/json.hpp" -#include - namespace CocoaTweet::API::Model { Tweet Tweet::parse(const unsigned int _responseCode, const std::string& _json) { auto j = nlohmann::json::parse(_json); diff --git a/src/cocoatweet/api/status/destroy.cc b/src/cocoatweet/api/status/destroy.cc index 257e8fb..bee285e 100644 --- a/src/cocoatweet/api/status/destroy.cc +++ b/src/cocoatweet/api/status/destroy.cc @@ -1,6 +1,6 @@ #include "cocoatweet/api/status/destroy.h" #include -#include + namespace CocoaTweet::API::Statuses { Destroy::Destroy() {} void Destroy::id(const std::string _id) { diff --git a/src/cocoatweet/api/status/status.cc b/src/cocoatweet/api/status/status.cc index 7ea485d..ce9d288 100644 --- a/src/cocoatweet/api/status/status.cc +++ b/src/cocoatweet/api/status/status.cc @@ -1,5 +1,3 @@ -#include - #include "cocoatweet/api/status/status.h" #include "cocoatweet/api/status/update.h" #include "cocoatweet/api/status/destroy.h" diff --git a/src/cocoatweet/api/status/update.cc b/src/cocoatweet/api/status/update.cc index af6e04b..e6e8612 100644 --- a/src/cocoatweet/api/status/update.cc +++ b/src/cocoatweet/api/status/update.cc @@ -1,5 +1,4 @@ #include "cocoatweet/api/status/update.h" -#include namespace CocoaTweet::API::Statuses { Update::Update() { diff --git a/src/cocoatweet/oauth/oauth.cc b/src/cocoatweet/oauth/oauth.cc index 7895229..8224e68 100644 --- a/src/cocoatweet/oauth/oauth.cc +++ b/src/cocoatweet/oauth/oauth.cc @@ -7,7 +7,6 @@ #include #include #include -#include extern "C" { #include @@ -26,7 +25,6 @@ std::map OAuth1::signature( std::vector tmp; for (const auto& [key, value] : _param) { tmp.push_back(key + "=" + value); - std::cout << (key + "=" + value) << std::endl; } std::string query = CocoaTweet::Util::join(tmp, "&"); @@ -36,10 +34,6 @@ std::map OAuth1::signature( CocoaTweet::Util::urlEncode(query); auto k64Sha1 = hmacSha1(significateKey, significateBase); - std::cout << "significate key : " << significateKey << std::endl; - std::cout << "significate base : " << significateBase << std::endl; - std::cout << "hmac-sha1 : " << k64Sha1 << std::endl; - auto ret = std::map{{"oauth_signature", k64Sha1}}; return ret; }