Refactored tweet and user classes

The only API-visible change is that these classes are no longer default constructible. Other than that, tweet now uses hatkirby::recptr to wrap its retweeted_status (tweet) and author (user) member objects, removing the need to implement the Rule of Five.

1 files changed, 16 insertions, 15 deletions

@@ -1,24 +1,25 @@
 #include "user.h"
 #include <json.hpp>
 #include "codes.h"
-#include "client.h"
 
 namespace twitter {
 
-  user::user(std::string data) try
-    : _valid(true)
+  user::user(std::string data)
   {
-    auto json = nlohmann::json::parse(data);
-    _id = json["id"].get<user_id>();
-    _screen_name = json["screen_name"].get<std::string>();
-    _name = json["name"].get<std::string>();
-    _protected = json["protected"].get<bool>();
-  } catch (const std::invalid_argument& error)
-  {
-    std::throw_with_nested(malformed_object("user", data));
-  } catch (const std::domain_error& error)
-  {
-    std::throw_with_nested(malformed_object("user", data));
+    try
+    {
+      auto json = nlohmann::json::parse(data);
+      _id = json["id"].get<user_id>();
+      _screen_name = json["screen_name"].get<std::string>();
+      _name = json["name"].get<std::string>();
+      _protected = json["protected"].get<bool>();
+    } catch (const std::invalid_argument& error)
+    {
+      std::throw_with_nested(malformed_object("user", data));
+    } catch (const std::domain_error& error)
+    {
+      std::throw_with_nested(malformed_object("user", data));
+    }
   }
 
-};
+}