From ae19a2f4361fbac5cd4d393291c6c088265e9647 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Fri, 18 Dec 2020 22:30:16 +0100 Subject: [PATCH] Revert "Add back partial support for twitter.com using the old twitter mobile UI" This reverts commit af103c976dd4992d79e9d9a71837aecff30d6e9c. --- src/Tweeper.php | 42 +----------------- src/rss_converter_twitter.com.xsl | 93 ++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 97 deletions(-) diff --git a/src/Tweeper.php b/src/Tweeper.php index b794368..9dc1381 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 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J)"; + private static $userAgent = "Mozilla/5.0"; 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 = ' ') { diff --git a/src/rss_converter_twitter.com.xsl b/src/rss_converter_twitter.com.xsl index bbb3bd8..e14eaac 100644 --- a/src/rss_converter_twitter.com.xsl +++ b/src/rss_converter_twitter.com.xsl @@ -45,11 +45,6 @@ - - - - - + + - + + + + + - + + - - - - + + - + - - - - - - - - - - - - - - - - - + + + + + + + <xsl:if test="($show-usernames = 1) or ($screen-name != $user-name)"> <xsl:value-of select="concat($user-name, ': ')"/> </xsl:if> - <!-- TODO twitter mobile UI does not have a way to detect this <xsl:if test="$item-has-video"> <xsl:text>(Video) </xsl:text> </xsl:if> - --> <!-- Prepend a space in front of the URLs which are not preceded by an open parenthesis, for aestethic reasons. @@ -176,8 +155,8 @@ <xsl:value-of select="$item-permalink"/> </guid> <pubDate> - <xsl:variable name="timestamp" select=".//td[@class='timestamp']/a|.//div[@class='metadata']/a"/> - <xsl:value-of select="php:functionString('Tweeper\Tweeper::twitterToRssDate', $timestamp)"/> + <xsl:variable name="timestamp" select=".//span[contains(@class, 'js-short-timestamp')]/@data-time"/> + <xsl:value-of select="php:functionString('Tweeper\Tweeper::epochToRssDate', number($timestamp))"/> </pubDate> <description> <xsl:text disable-output-escaping="yes"><![CDATA[</xsl:text> @@ -185,7 +164,6 @@ <xsl:value-of select="concat($user-name, ':')"/> <xsl:element name="br"/> </xsl:if> - <!-- TODO twitter mobile UI does not support embedded media <xsl:if test="$item-has-video"> <xsl:text> (Video)</xsl:text> <xsl:element name="br"/> @@ -194,22 +172,18 @@ <xsl:text> (GIF)</xsl:text> <xsl:element name="br"/> </xsl:if> - --> <xsl:element name="span"> <xsl:attribute name="style">white-space: pre-wrap;</xsl:attribute> <xsl:apply-templates select="$item-content/node()"/> </xsl:element> - - <!-- TODO twitter mobile UI does not support embedded media <xsl:if test="$show-multimedia = 1"> - <xsl:apply-templates select="$item-media"/> + <xsl:apply-templates select="$item-media/node()"/> </xsl:if> - --> <xsl:text disable-output-escaping="yes">]]></xsl:text> </description> <xsl:if test="$generate-enclosure = 1"> <xsl:apply-templates select="$item-content//a[@data-expanded-url]" mode="enclosure"/> - <xsl:apply-templates select="$item-media" mode="enclosure"/> + <xsl:apply-templates select="$item-media//div[@data-image-url]" mode="enclosure"/> </xsl:if> </item> </xsl:template> @@ -221,12 +195,12 @@ <xsl:value-of select="concat('Twitter / ', $screen-name)"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="concat('Twitter / ', normalize-space(//td[@id='search']//input/@value))"/> + <xsl:value-of select="concat('Twitter / ', normalize-space(//h1[1]))"/> </xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="channel-link" select="//link[@rel='canonical']/@href"/> - <xsl:variable name="channel-image" select="//table[@class='profile-details' or @class='main-tweet']//td[@class='avatar']//img/@src"/> + <xsl:variable name="channel-image" select="//a[contains(@class, 'profile-picture')]/@href"/> <rss version="2.0"> <xsl:attribute name="xml:base"><xsl:value-of select="$BaseURL" /></xsl:attribute> @@ -239,7 +213,9 @@ <xsl:value-of select="$channel-link"/> </link> <description> - <xsl:value-of select="normalize-space(//table[@class='profile-details' or @class='main-tweet']//td[@class='details'])"/> + <xsl:value-of select="normalize-space(//div[@class='ProfileHeaderCard'])"/> + <!-- The following rule should only match on hashtag URLs --> + <xsl:value-of select="normalize-space(//div[@class='SearchNavigation-textContainer'])"/> </description> <xsl:if test="$channel-image != ''"> <image> @@ -254,7 +230,12 @@ </url> </image> </xsl:if> - <xsl:apply-templates select="//div[contains(@class, 'timeline')]/table[@class='tweet ']|//div[@class='main-tweet-container']/table[@class='main-tweet']"/> + <xsl:apply-templates select="//ol[@id='stream-items-id']/li[@data-item-id and @data-item-type='tweet' and not(contains(@class, 'has-profile-promoted-tweet'))]"/> + + <!-- These rules will only match on permalink URLs --> + <xsl:apply-templates select="//div[@class='permalink-inner permalink-tweet-container']"/> + <xsl:apply-templates select="//div[@data-component-context='replies']//li[@data-item-id and @data-item-type='tweet' and not(contains(@class, 'has-profile-promoted-tweet'))]"/> + </channel> </rss> </xsl:template> -- 2.1.4