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

diff --git a/rss_converter_twitter.com.xsl b/rss_converter_twitter.com.xsl
index db78963..82a16a7 100644
--- a/rss_converter_twitter.com.xsl
+++ b/rss_converter_twitter.com.xsl
@@ -1,7 +1,7 @@
 <!--
   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.
 
@@ -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:extension-element-prefixes="php">
+    xsl:extension-element-prefixes="php"
+    exclude-result-prefixes="php">
 
     <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>
 
@@ -40,13 +41,17 @@
     <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')]"/>
+        <xsl:variable name="tweet-permalink" select="concat($BaseURL, .//a[contains(@class, 'js-permalink')]/@href)"/>
         <item>
             <title>
                 <xsl:value-of select="concat($user-name, ': ', $tweet-text)"/>
             </title>
             <link>
-                <xsl:value-of select="concat($twitterBaseURL, .//a[contains(@class, 'js-permalink')]/@href)"/>
+                <xsl:value-of select="$tweet-permalink"/>
             </link>
+            <guid>
+                <xsl:value-of select="$tweet-permalink"/>
+            </guid>
             <pubDate>
                 <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))"/>
@@ -64,23 +69,31 @@
     </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">
-            <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>
-                    <xsl:text>Twitter / </xsl:text><xsl:value-of select="$screen-name"/>
+                    <xsl:value-of select="$channel-title"/>
                 </title>
                 <link>
-                    <xsl:value-of select="//link[@rel='canonical']/@href"/>
+                    <xsl:value-of select="$channel-link"/>
                 </link>
                 <description>
                     <xsl:value-of select="//meta[@name='description']/@content"/>
                 </description>
                 <image>
+                    <title>
+                        <xsl:value-of select="$channel-title"/>
+                    </title>
+                    <link>
+                        <xsl:value-of select="$channel-link"/>
+                    </link>
                     <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>
                 <xsl:apply-templates select="//*[@data-item-type='tweet']"/>