diff --git a/src/cocoatweet/api/api.cc b/src/cocoatweet/api/api.cc index 5249a36..af529c1 100644 --- a/src/cocoatweet/api/api.cc +++ b/src/cocoatweet/api/api.cc @@ -2,10 +2,10 @@ namespace CocoaTweet::API { API::API(CocoaTweet::OAuth::Key _key) { - oauth_ = std::make_shared(_key); - status_ = Statuses::Status(oauth_); - favorite_ = Favorites::Favorite(oauth_); - media_ = Medias::Media(oauth_); + oauth_ = std::make_shared(_key); + status_ = Statuses::Status(oauth_); + favorite_ = Favorites::Favorite(oauth_); + media_ = Medias::Media(oauth_); directMessage_ = DirectMessages::DirectMessage(oauth_); } @@ -21,7 +21,7 @@ Medias::Media API::media() const { return media_; } -DirectMessages::DirectMessage API::directMessage() const{ +DirectMessages::DirectMessage API::directMessage() const { return directMessage_; } } // namespace CocoaTweet::API diff --git a/src/cocoatweet/api/directMessage/directMessage.cc b/src/cocoatweet/api/directMessage/directMessage.cc index ee94d67..4788418 100644 --- a/src/cocoatweet/api/directMessage/directMessage.cc +++ b/src/cocoatweet/api/directMessage/directMessage.cc @@ -1,15 +1,15 @@ #include #include -namespace CocoaTweet::API::DirectMessages{ - DirectMessage::DirectMessage(std::shared_ptr _oauth){ - oauth_ = _oauth; - } - - void DirectMessage::messageCreate(const std::string& _recipient, const std::string& _message){ - CocoaTweet::API::DirectMessages::New dm; - dm.recipient(_recipient); - dm.message(_message); - dm.process(oauth_); - } -} \ No newline at end of file +namespace CocoaTweet::API::DirectMessages { +DirectMessage::DirectMessage(std::shared_ptr _oauth) { + oauth_ = _oauth; +} + +void DirectMessage::messageCreate(const std::string& _recipient, const std::string& _message) { + CocoaTweet::API::DirectMessages::New dm; + dm.recipient(_recipient); + dm.message(_message); + dm.process(oauth_); +} +} // namespace CocoaTweet::API::DirectMessages \ No newline at end of file diff --git a/src/cocoatweet/api/directMessage/directMessage.h b/src/cocoatweet/api/directMessage/directMessage.h index adbdefe..d796111 100644 --- a/src/cocoatweet/api/directMessage/directMessage.h +++ b/src/cocoatweet/api/directMessage/directMessage.h @@ -17,10 +17,11 @@ public: /// @brief constructor which finally should to be called. /// @param[in] std::shared_ptr : pointer to OAuth object DirectMessage(std::shared_ptr _oauth); - + void messageCreate(const std::string& _recipient, const std::string& _message); + private: }; -} // namespace CocoaTweet::API::Statuses +} // namespace CocoaTweet::API::DirectMessages #endif diff --git a/src/cocoatweet/api/directMessage/new.cc b/src/cocoatweet/api/directMessage/new.cc index 34220e6..7cbbbec 100644 --- a/src/cocoatweet/api/directMessage/new.cc +++ b/src/cocoatweet/api/directMessage/new.cc @@ -2,30 +2,29 @@ #include #include -namespace CocoaTweet::API::DirectMessages{ - New::New(){ - url_ = "https://api.twitter.com/1.1/direct_messages/events/new.json"; - contentType_ = "application/json"; +namespace CocoaTweet::API::DirectMessages { +New::New() { + url_ = "https://api.twitter.com/1.1/direct_messages/events/new.json"; + contentType_ = "application/json"; - nlohmann::json tmp; - tmp["type"] = "message_create"; - tmp["message_create"] = nlohmann::json::object(); - tmp["message_create"]["target"] = nlohmann::json::object(); - tmp["message_create"]["message_data"] = nlohmann::json::object(); - json_["event"] = tmp; - } + nlohmann::json tmp; + tmp["type"] = "message_create"; + tmp["message_create"] = nlohmann::json::object(); + tmp["message_create"]["target"] = nlohmann::json::object(); + tmp["message_create"]["message_data"] = nlohmann::json::object(); + json_["event"] = tmp; +} +void New::recipient(const std::string& _id) { + json_["event"]["message_create"]["target"]["recipient_id"] = std::stol(_id); +} - void New::recipient(const std::string& _id){ - json_["event"]["message_create"]["target"]["recipient_id"] = std::stol(_id); - } +void New::message(const std::string& _message) { + json_["event"]["message_create"]["message_data"]["text"] = _message; +} - void New::message(const std::string& _message){ - json_["event"]["message_create"]["message_data"]["text"] = _message; - } - - void New::process(std::weak_ptr _oauth){ - bodyParam_.insert_or_assign("data", json_.dump()); - HttpPost::process(_oauth, [](const std::string& _rcv){}); - } -} \ No newline at end of file +void New::process(std::weak_ptr _oauth) { + bodyParam_.insert_or_assign("data", json_.dump()); + HttpPost::process(_oauth, [](const std::string& _rcv) {}); +} +} // namespace CocoaTweet::API::DirectMessages \ No newline at end of file diff --git a/src/cocoatweet/api/directMessage/new.h b/src/cocoatweet/api/directMessage/new.h index 2cb3647..e717e9a 100644 --- a/src/cocoatweet/api/directMessage/new.h +++ b/src/cocoatweet/api/directMessage/new.h @@ -16,8 +16,6 @@ public: void recipient(const std::string& _id); void message(const std::string& _message); - - /// @brief process request for endpoint /// @param[in] std::weak_ptr _oauth : pointer to oauth object /// @param[out] CocoaTweet::API::Model::Tweet : request result @@ -27,6 +25,6 @@ private: std::string status_; nlohmann::json json_; }; -} // namespace CocoaTweet::API::Statuses +} // namespace CocoaTweet::API::DirectMessages #endif diff --git a/src/cocoatweet/api/interface/httpPost.cc b/src/cocoatweet/api/interface/httpPost.cc index e9313a7..1d42587 100644 --- a/src/cocoatweet/api/interface/httpPost.cc +++ b/src/cocoatweet/api/interface/httpPost.cc @@ -53,7 +53,7 @@ void HttpPost::process(std::weak_ptr _oauth, ("Content-Disposition: form-data; name=\"" + key + "\";\r\n\r\n" + value + "\r\n"); } requestBody += (std::string("--") + "milkcocoa0902" + "--" + "\r\n"); - }else if(contentType_ == "application/json"){ + } else if (contentType_ == "application/json") { requestBody = bodyParam_["data"]; } } @@ -97,7 +97,7 @@ void HttpPost::process(std::weak_ptr _oauth, contentType = contentType_; } else if (contentType_ == "multipart/form-data") { contentType = contentType_ + "; boundary=milkcocoa0902"; - }else if(contentType_ == "application/json"){ + } else if (contentType_ == "application/json") { contentType_ = "application/json"; }