X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/b922824bc561f7f3e31c6f9962d96e9084497ced..357d7a4955830d690a16d52a6f91e351c813ab48:/src/Tweeper.php

diff --git a/src/Tweeper.php b/src/Tweeper.php
index f1d579f..4a32f56 100644
--- a/src/Tweeper.php
+++ b/src/Tweeper.php
@@ -36,7 +36,7 @@ date_default_timezone_set('UTC');
  */
 class Tweeper {
 
-  private static $userAgent = "Mozilla/5.0";
+  private static $userAgent = "APIs-Google (+https://developers.google.com/webmasters/APIs-Google.html)";
   private static $maxConnectionTimeout = 5;
   private static $maxConnectionRetries = 5;
 
@@ -87,46 +87,6 @@ class Tweeper {
   }
 
   /**
-   * Convert Twitter mobile date to the date format expected in a RSS document.
-   */
-  public static function twitterToRssDate($date) {
-    // Twitter uses relative timestamps in minutes for recent tweets.
-    if (preg_match('/^(\d+)m$/', $date, $matches)) {
-      $timestamp = strtotime("+" . $matches[1] . " min", time());
-      if (FALSE === $timestamp) {
-        $timestamp = 0;
-      }
-    }
-    else {
-      /*
-       * In case the time is specified put it after the date,
-       * to make it recognized by strptime().
-       */
-      if (preg_match('/(.*) - (.*)/', $date, $matches)) {
-        $date = $matches[2] . " " . $matches[1];
-      }
-
-      $timestamp = strtotime($date);
-      if (FALSE === $timestamp) {
-        $timestamp = 0;
-      }
-
-      /*
-       * The twitter mobile UI usually only specifies the month and the day, so
-       * strtotime($date) may interpret the date as being in the future.
-       *
-       * If the date is in the future it is probably in the same day but in the
-       * previous year.
-       */
-      if ($timestamp > time()) {
-        $timestamp = strtotime('-1 years', $timestamp);
-      }
-    }
-
-    return Tweeper::epochToRssDate($timestamp);
-  }
-
-  /**
    * Convert string to UpperCamelCase.
    */
   public static function toUpperCamelCase($str, $delim = ' ') {
@@ -455,15 +415,7 @@ class Tweeper {
       return NULL;
     }
 
-    // Override User-Agent for twitter.com to force it to serve the mobile UI.
-    if ($host == "twitter.com") {
-      $user_agent = "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J)";
-    }
-    else {
-      $user_agent = NULL;
-    }
-
-    $html = Tweeper::getUrlContents($src_url, $user_agent);
+    $html = Tweeper::getUrlContents($src_url);
     if (FALSE === $html) {
       trigger_error("Failed to retrieve $src_url", E_USER_WARNING);
       return NULL;