X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/f82b9f8a651307d7c6ba52c2d1d7da3dcc696189..cd5ef94382bd20a5d085e12b819d5d301e720c77:/rss_converter_twitter.com.xsl

diff --git a/rss_converter_twitter.com.xsl b/rss_converter_twitter.com.xsl
index 7f07ad7..db78963 100644
--- a/rss_converter_twitter.com.xsl
+++ b/rss_converter_twitter.com.xsl
@@ -32,25 +32,27 @@
     </xsl:variable>
 
     <xsl:template match="a[@data-expanded-url]">
-        <xsl:value-of disable-output-escaping="yes" select="php:function('generate_enclosure', string(./@data-expanded-url))"/>
+        <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(./@data-expanded-url))"/>
     </xsl:template>
 
-    <xsl:variable name="screen-name" select="//div[@class='profile-card-inner']/@data-screen-name"/>
+    <xsl:variable name="screen-name" select="//div[@class='user-actions btn-group not-following ']/@data-screen-name"/>
 
-    <xsl:template match="//div[@id='timeline']//ol[@id='stream-items-id']//li[@data-item-type='tweet']">
-        <xsl:variable name="tweet-text" select=".//p[@class='js-tweet-text tweet-text']"/>
+    <xsl:template match="//*[@data-item-type='tweet']">
+        <xsl:variable name="user-name" select=".//div[contains(@class, 'js-stream-tweet')]/@data-screen-name"/>
+        <xsl:variable name="tweet-text" select=".//p[contains(@class, 'js-tweet-text')]"/>
         <item>
             <title>
-                <xsl:value-of select="concat($screen-name, ': ', $tweet-text)"/>
+                <xsl:value-of select="concat($user-name, ': ', $tweet-text)"/>
             </title>
             <link>
-                <xsl:value-of select="concat($twitterBaseURL, .//a[@class='details with-icn js-details']/@href)"/>
+                <xsl:value-of select="concat($twitterBaseURL, .//a[contains(@class, 'js-permalink')]/@href)"/>
             </link>
             <pubDate>
-                <xsl:value-of select="php:functionString('epoch_to_gmdate', .//small[@class='time']//span/@data-time)"/>
+                <xsl:variable name="timestamp" select=".//span[contains(@class, 'js-short-timestamp')]/@data-time"/>
+                <xsl:value-of select="php:functionString('Tweeper::epoch_to_gmdate', number($timestamp))"/>
             </pubDate>
             <description>
-                <xsl:value-of select="concat($screen-name, ': ')"/>
+                <xsl:value-of select="concat($user-name, ': ')"/>
                 <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
                 <xsl:copy-of select="$tweet-text/node()"/>
                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
@@ -64,6 +66,7 @@
     <xsl:template match="/">
 
         <rss version="2.0">
+            <xsl:attribute name="xml:base"><xsl:value-of select="$twitterBaseURL" /></xsl:attribute>
             <channel>
                 <generator>Tweeper</generator>
                 <title>
@@ -80,7 +83,7 @@
                         <xsl:value-of select="//a[@class='profile-picture media-thumbnail']/@href"/>
                     </url>
                 </image>
-                <xsl:apply-templates select="//div[@id='timeline']//ol[@id='stream-items-id']//li[@data-item-type='tweet']"/>
+                <xsl:apply-templates select="//*[@data-item-type='tweet']"/>
             </channel>
         </rss>
     </xsl:template>