tweeper.php: factor out an html_to_xml() function from the tweep() method

[tweeper.git] / rss_converter_twitter.com.xsl

diff --git a/rss_converter_twitter.com.xsl b/rss_converter_twitter.com.xsl
index b67946e..665b71d 100644 (file)
--- a/rss_converter_twitter.com.xsl
+++ b/rss_converter_twitter.com.xsl
@@ -1,7 +1,7 @@
 <!--
   Stylesheet to convert Twitter user timelines to RSS.
 
 <!--
   Stylesheet to convert Twitter user timelines to RSS.
 

-  Copyright (C) 2013  Antonio Ospite <ospite@studenti.unina.it>
+  Copyright (C) 2013-2014  Antonio Ospite <ao2@ao2.it>

 
   This file is part of tweeper.
 
 
   This file is part of tweeper.
 


@@ -21,13 +21,14 @@
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:php="http://php.net/xsl"
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:php="http://php.net/xsl"

-    xsl:extension-element-prefixes="php">
+    xsl:extension-element-prefixes="php"
+    exclude-result-prefixes="php">

 
     <xsl:param name="generateEnclosure"/>
 
     <xsl:output method="xml" indent="yes"/>
 
 
     <xsl:param name="generateEnclosure"/>
 
     <xsl:output method="xml" indent="yes"/>
 

-    <xsl:variable name="twitterBaseURL">
+    <xsl:variable name="BaseURL">

         <xsl:text>https://twitter.com</xsl:text>
     </xsl:variable>
 
         <xsl:text>https://twitter.com</xsl:text>
     </xsl:variable>
 


@@ -35,52 +36,67 @@
         <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(./@data-expanded-url))"/>
     </xsl:template>
 
         <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="item-content" select=".//p[contains(@class, 'js-tweet-text')]"/>
+        <xsl:variable name="item-permalink" select="concat($BaseURL, .//a[contains(@class, 'js-permalink')]/@href)"/>

         <item>
             <title>
         <item>
             <title>

-                <xsl:value-of select="concat($screen-name, ': ', $tweet-text)"/>
+                <xsl:value-of select="concat($user-name, ': ', $item-content)"/>

             </title>
             <link>
             </title>
             <link>

-                <xsl:value-of select="concat($twitterBaseURL, .//a[@class='details with-icn js-details']/@href)"/>
+                <xsl:value-of select="$item-permalink"/>

             </link>
             </link>

+            <guid>
+                <xsl:value-of select="$item-permalink"/>
+            </guid>

             <pubDate>
             <pubDate>

-                <xsl:value-of select="php:functionString('Tweeper::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>
             </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: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: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>
 
     <xsl:template match="/">
             </xsl:if>
         </item>
     </xsl:template>
 
     <xsl:template match="/">

+        <xsl:variable name="channel-title" select="concat('Twitter / ', $screen-name)"/>
+        <xsl:variable name="channel-link" select="//link[@rel='canonical']/@href"/>

 
         <rss version="2.0">
 
         <rss version="2.0">

+            <xsl:attribute name="xml:base"><xsl:value-of select="$BaseURL" /></xsl:attribute>

             <channel>
                 <generator>Tweeper</generator>
                 <title>
             <channel>
                 <generator>Tweeper</generator>
                 <title>

-                    <xsl:text>Twitter / </xsl:text><xsl:value-of select="$screen-name"/>
+                    <xsl:value-of select="$channel-title"/>

                 </title>
                 <link>
                 </title>
                 <link>

-                    <xsl:value-of select="//link[@rel='canonical']/@href"/>
+                    <xsl:value-of select="$channel-link"/>

                 </link>
                 <description>
                 </link>
                 <description>

-                    <xsl:value-of select="//meta[@name='description']/@content"/>
+                    <xsl:value-of select="normalize-space(//div[@class='ProfileHeaderCard'])"/>

                 </description>
                 <image>
                 </description>
                 <image>

+                    <title>
+                        <xsl:value-of select="$channel-title"/>
+                    </title>
+                    <link>
+                        <xsl:value-of select="$channel-link"/>
+                    </link>

                     <url>
                     <url>

-                        <xsl:value-of select="//a[@class='profile-picture media-thumbnail']/@href"/>
+                        <xsl:value-of select="//a[contains(@class, 'profile-picture media-thumbnail')]/@href"/>

                     </url>
                 </image>
                     </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>
             </channel>
         </rss>
     </xsl:template>