X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/72485ebd9b564be20255a3377d381dc1b94c0359..e64422f4586b4ba25bbc13e56b8ac02ad74d92b7:/rss_converter_twitter.com.xsl

diff --git a/rss_converter_twitter.com.xsl b/rss_converter_twitter.com.xsl
index 76937e4..9185a54 100644
--- a/rss_converter_twitter.com.xsl
+++ b/rss_converter_twitter.com.xsl
@@ -28,7 +28,7 @@
 
     <xsl:output method="xml" indent="yes"/>
 
-    <xsl:variable name="twitterBaseURL">
+    <xsl:variable name="BaseURL">
         <xsl:text>https://twitter.com</xsl:text>
     </xsl:variable>
 
@@ -38,19 +38,19 @@
 
     <xsl:variable name="screen-name" select="//div[@class='user-actions btn-group not-following ']/@data-screen-name"/>
 
-    <xsl:template match="//*[@data-item-type='tweet']">
+    <xsl:template match="//li[@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')]"/>
-        <xsl:variable name="tweet-permalink" select="concat($twitterBaseURL, .//a[contains(@class, 'js-permalink')]/@href)"/>
+        <xsl:variable name="item-content" select=".//p[contains(@class, 'js-tweet-text')]"/>
+        <xsl:variable name="item-permalink" select="concat($BaseURL, .//div[@data-permalink-path]/@data-permalink-path)"/>
         <item>
             <title>
-                <xsl:value-of select="concat($user-name, ': ', $tweet-text)"/>
+                <xsl:value-of select="concat($user-name, ': ', $item-content)"/>
             </title>
             <link>
-                <xsl:value-of select="$tweet-permalink"/>
+                <xsl:value-of select="$item-permalink"/>
             </link>
             <guid>
-                <xsl:value-of select="$tweet-permalink"/>
+                <xsl:value-of select="$item-permalink"/>
             </guid>
             <pubDate>
                 <xsl:variable name="timestamp" select=".//span[contains(@class, 'js-short-timestamp')]/@data-time"/>
@@ -59,11 +59,11 @@
             <description>
                 <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:copy-of select="$item-content/node()"/>
                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
             </description>
             <xsl:if test="$generateEnclosure = 1">
-                <xsl:apply-templates select="$tweet-text//a[@data-expanded-url]"/>
+                <xsl:apply-templates select="$item-content//a[@data-expanded-url]"/>
             </xsl:if>
         </item>
     </xsl:template>
@@ -73,7 +73,7 @@
         <xsl:variable name="channel-link" select="//link[@rel='canonical']/@href"/>
 
         <rss version="2.0">
-            <xsl:attribute name="xml:base"><xsl:value-of select="$twitterBaseURL" /></xsl:attribute>
+            <xsl:attribute name="xml:base"><xsl:value-of select="$BaseURL" /></xsl:attribute>
             <channel>
                 <generator>Tweeper</generator>
                 <title>
@@ -83,7 +83,7 @@
                     <xsl:value-of select="$channel-link"/>
                 </link>
                 <description>
-                    <xsl:value-of select="//meta[@name='description']/@content"/>
+                    <xsl:value-of select="normalize-space(//div[@class='ProfileHeaderCard'])"/>
                 </description>
                 <image>
                     <title>
@@ -96,7 +96,7 @@
                         <xsl:value-of select="//a[contains(@class, 'profile-picture media-thumbnail')]/@href"/>
                     </url>
                 </image>
-                <xsl:apply-templates select="//*[@data-item-type='tweet']"/>
+                <xsl:apply-templates select="//li[@data-item-type='tweet']"/>
             </channel>
         </rss>
     </xsl:template>