Merge branch 'master' of https://github.com/hatkirby/libtwittercpp

3 files changed, 56 insertions, 43 deletions

@@ -101,55 +101,55 @@ namespace twitter {
   
   void stream::run(std::string url)
   {
-    curl::curl_ios<stream> ios(this, [] (void* contents, size_t size, size_t nmemb, void* userp) {
-      return static_cast<stream*>(userp)->write(static_cast<char*>(contents), size, nmemb);
-    });
+    _backoff_type = backoff::none;
+    _backoff_amount = std::chrono::milliseconds(0);
+    for (;;)
+    {
+      curl::curl_ios<stream> ios(this, [] (void* contents, size_t size, size_t nmemb, void* userp) {
+        return static_cast<stream*>(userp)->write(static_cast<char*>(contents), size, nmemb);
+      });
     
-    curl::curl_easy conn(ios);
-    curl::curl_header headers;
-    std::string oauth_header;
+      curl::curl_easy conn(ios);
+      curl::curl_header headers;
+      std::string oauth_header;
     
-    try
-    {
-      oauth_header = _client._oauth_client->getFormattedHttpHeader(OAuth::Http::Get, url, "");
+      try
+      {
+        oauth_header = _client._oauth_client->getFormattedHttpHeader(OAuth::Http::Get, url, "");
       
-      if (!oauth_header.empty())
+        if (!oauth_header.empty())
+        {
+          headers.add(oauth_header);
+        }
+      } catch (const OAuth::ParseError& error)
       {
-        headers.add(oauth_header);
-      }
-    } catch (const OAuth::ParseError& error)
-    {
-      std::cout << "Error generating OAuth header:" << std::endl;
-      std::cout << error.what() << std::endl;
-      std::cout << "This is likely due to a malformed URL." << std::endl;
+        std::cout << "Error generating OAuth header:" << std::endl;
+        std::cout << error.what() << std::endl;
+        std::cout << "This is likely due to a malformed URL." << std::endl;
   
-      assert(false);
-    }
+        assert(false);
+      }
     
-    try
-    {
-      conn.add<CURLOPT_HEADERFUNCTION>(nullptr);
-      conn.add<CURLOPT_HEADERDATA>(nullptr);
-      conn.add<CURLOPT_XFERINFOFUNCTION>([] (void* cdata, curl_off_t, curl_off_t, curl_off_t, curl_off_t) {
-        return static_cast<stream*>(cdata)->progress();
-      });
-      conn.add<CURLOPT_XFERINFODATA>(this);
-      conn.add<CURLOPT_NOPROGRESS>(0);
-      //conn.add<CURLOPT_VERBOSE>(1);
-      //conn.add<CURLOPT_DEBUGFUNCTION>(my_trace);
-      conn.add<CURLOPT_URL>(url.c_str());
-      conn.add<CURLOPT_HTTPHEADER>(headers.get());
-    } catch (const curl::curl_exception& error)
-    {
-      error.print_traceback();
+      try
+      {
+        conn.add<CURLOPT_HEADERFUNCTION>(nullptr);
+        conn.add<CURLOPT_HEADERDATA>(nullptr);
+        conn.add<CURLOPT_XFERINFOFUNCTION>([] (void* cdata, curl_off_t, curl_off_t, curl_off_t, curl_off_t) {
+          return static_cast<stream*>(cdata)->progress();
+        });
+        conn.add<CURLOPT_XFERINFODATA>(this);
+        conn.add<CURLOPT_NOPROGRESS>(0);
+        //conn.add<CURLOPT_VERBOSE>(1);
+        //conn.add<CURLOPT_DEBUGFUNCTION>(my_trace);
+        conn.add<CURLOPT_URL>(url.c_str());
+        conn.add<CURLOPT_HTTPHEADER>(headers.get());
+      } catch (const curl::curl_exception& error)
+      {
+        error.print_traceback();
+      
+        assert(false);
+      }
       
-      assert(false);
-    }
-    
-    _backoff_type = backoff::none;
-    _backoff_amount = std::chrono::milliseconds(0);
-    for (;;)
-    {
       bool failure = false;
       try
       {
@@ -66,4 +66,15 @@ namespace twitter {
     return *_author == _client.getUser();
   }
   
+  std::string tweet::getURL() const
+  {
+    std::ostringstream urlstr;
+    urlstr << "https://twitter.com";
+    urlstr << _author->getScreenName();
+    urlstr << "/statuses/";
+    urlstr << _id;
+    
+    return urlstr.str();
+  }
+  
 };
@@ -39,7 +39,7 @@ namespace twitter {
       {
         return *_author;
       }
-      
+
       bool isRetweet() const
       {
         return _is_retweet;
@@ -63,6 +63,8 @@ namespace twitter {
       
       bool isMyTweet() const;
       
+      std::string getURL() const;
+      
     private:
       
       const client& _client;