Made tweets, users, and notifications into copyable objects

Notifications are now also mutable. Users and tweets no longer have helper methods for interacting with the client. Fixed a bug (possibly introduced by a change to the Twitter API) that caused non-reply tweets to be marked as unknown notifications.

1 files changed, 48 insertions, 4 deletions

@@ -88,25 +88,69 @@ namespace twitter {
     
     type getType() const;
     
+    notification() {}
     notification(const client& tclient, std::string data);
+    
+    notification(const notification& other);
     notification(notification&& other);
-    notification& operator=(notification&& other);
+    notification& operator=(notification other);
     ~notification();
     
-    notification(const notification& other) = delete;
-    notification& operator=(const notification& other) = delete;
+    friend void swap(notification& first, notification& second);
     
     const tweet& getTweet() const;
+    tweet& getTweet()
+    {
+      return const_cast<tweet&>(static_cast<const notification&>(*this).getTweet());
+    }
+    
     const user& getUser() const;
+    user& getUser()
+    {
+      return const_cast<user&>(static_cast<const notification&>(*this).getUser());
+    }
+    
     const list& getList() const;
+    list& getList()
+    {
+      return const_cast<list&>(static_cast<const notification&>(*this).getList());
+    }
+    
     tweet_id getTweetID() const;
+    void setTweetID(tweet_id _arg);
+    
     user_id getUserID() const;
+    void setUserID(user_id _arg);
+    
     const std::vector<std::string>& getCountries() const;
+    std::vector<std::string>& getCountries()
+    {
+      return const_cast<std::vector<std::string>&>(static_cast<const notification&>(*this).getCountries());
+    }
+    
     disconnect_code getDisconnectCode() const;
+    void setDisconnectCode(disconnect_code _arg);
+    
     const std::set<user_id>& getFriends() const;
+    std::set<user_id>& getFriends()
+    {
+      return const_cast<std::set<user_id>&>(static_cast<const notification&>(*this).getFriends());
+    }
+    
     const direct_message& getDirectMessage() const;
+    direct_message& getDirectMessage()
+    {
+      return const_cast<direct_message&>(static_cast<const notification&>(*this).getDirectMessage());
+    }
+    
     int getLimit() const;
+    void setLimit(int _arg);
+    
     const std::string& getWarning() const;
+    std::string& getWarning()
+    {
+      return const_cast<std::string&>(static_cast<const notification&>(*this).getWarning());
+    }
     
   private:
     union {
@@ -140,7 +184,7 @@ namespace twitter {
       std::set<user_id> _friends;
       direct_message _direct_message;
     };
-    type _type;
+    type _type = type::invalid;
   };
   
 };