1 files changed, 22 insertions, 14 deletions

@@ -10,20 +10,14 @@
 #include "auth.h"
 #include "configuration.h"
 #include "util.h"
-
-namespace OAuth {
-  class Consumer;
-  class Token;
-  class Client;
-};
+#include "timeline.h"
 
 namespace twitter {
 
   class client {
   public:
 
-    client(const auth& _auth);
-    ~client();
+    client(const auth& arg);
 
     tweet updateStatus(std::string msg, std::list<long> media_ids = {}) const;
     long uploadMedia(std::string media_type, const char* data, long data_length) const;
@@ -51,18 +45,32 @@ namespace twitter {
 
     const configuration& getConfiguration() const;
 
-  private:
+    timeline& getHomeTimeline()
+    {
+      return homeTimeline_;
+    }
 
-    friend class stream;
+    timeline& getMentionsTimeline()
+    {
+      return mentionsTimeline_;
+    }
 
-    std::unique_ptr<OAuth::Consumer> _oauth_consumer;
-    std::unique_ptr<OAuth::Token> _oauth_token;
-    std::unique_ptr<OAuth::Client> _oauth_client;
+  private:
 
-    std::unique_ptr<user> _current_user;
+    const auth& auth_;
+
+    user currentUser_;
 
     mutable std::unique_ptr<configuration> _configuration;
     mutable time_t _last_configuration_update;
+
+    timeline homeTimeline_ {
+      auth_,
+      "https://api.twitter.com/1.1/statuses/home_timeline.json"};
+
+    timeline mentionsTimeline_ {
+      auth_,
+      "https://api.twitter.com/1.1/statuses/mentions_timeline.json"};
   };
 
 };