2 files changed, 72 insertions, 3 deletions

@@ -17,7 +17,14 @@ namespace twitter {
     _id = _data.at("id");
     _text = _data.at("text");
     _author = user(_data.at("user").dump());
-    _retweeted = _data.at("retweeted");
+    
+    if (_data.find("retweeted_status") != _data.end())
+    {
+      _is_retweet = true;
+      
+      std::string retweet = _data.at("retweeted_status").dump();
+      _retweeted_status = new tweet(retweet);
+    }
     
     if (_data.find("entities") != _data.end())
     {
@@ -32,6 +39,53 @@ namespace twitter {
     }
   }
   
+  tweet::tweet(const tweet& other)
+  {
+    _valid = other._valid;
+    _id = other._id;
+    _text = other._text;
+    _author = other._author;
+    _is_retweet = other._is_retweet;
+    
+    if (_is_retweet)
+    {
+      _retweeted_status = new tweet(*other._retweeted_status);
+    }
+    
+    _mentions = other._mentions;
+  }
+  
+  tweet::tweet(tweet&& other) : tweet()
+  {
+    swap(*this, other);
+  }
+  
+  tweet::~tweet()
+  {
+    if (_is_retweet)
+    {
+      delete _retweeted_status;
+    }
+  }
+  
+  tweet& tweet::operator=(tweet other)
+  {
+    swap(*this, other);
+    
+    return *this;
+  }
+
+  void swap(tweet& first, tweet& second)
+  {
+    std::swap(first._valid, second._valid);
+    std::swap(first._id, second._id);
+    std::swap(first._text, second._text);
+    std::swap(first._author, second._author);
+    std::swap(first._is_retweet, second._is_retweet);
+    std::swap(first._retweeted_status, second._retweeted_status);
+    std::swap(first._mentions, second._mentions);
+  }
+  
   tweet_id tweet::getID() const
   {
     assert(_valid);
@@ -57,7 +111,14 @@ namespace twitter {
   {
     assert(_valid);
     
-    return _retweeted;
+    return _is_retweet;
+  }
+  
+  tweet tweet::getRetweet() const
+  {
+    assert(_valid && _is_retweet);
+    
+    return *_retweeted_status;
   }
   
   std::vector<std::pair<user_id, std::string>> tweet::getMentions() const
@@ -14,11 +14,18 @@ namespace twitter {
     public:
       tweet();
       tweet(std::string data);
+      tweet(const tweet& other);
+      tweet(tweet&& other);
+      ~tweet();
+      
+      tweet& operator=(tweet other);
+      friend void swap(tweet& first, tweet& second);
       
       tweet_id getID() const;
       std::string getText() const;
       const user& getAuthor() const;
       bool isRetweet() const;
+      tweet getRetweet() const;
       std::vector<std::pair<user_id, std::string>> getMentions() const;
       
       operator bool() const;
@@ -28,7 +35,8 @@ namespace twitter {
       tweet_id _id;
       std::string _text;
       user _author;
-      bool _retweeted;
+      bool _is_retweet = false;
+      tweet* _retweeted_status = nullptr;
       std::vector<std::pair<user_id, std::string>> _mentions;
   };