debian/changelog: release package version 0.6-1

[tweeper.git] / rss_converter_instagram.com.xsl

diff --git a/rss_converter_instagram.com.xsl b/rss_converter_instagram.com.xsl
index 5ce83dd..e869d7d 100644 (file)
--- a/rss_converter_instagram.com.xsl
+++ b/rss_converter_instagram.com.xsl
@@ -24,7 +24,7 @@
     xsl:extension-element-prefixes="php"
     exclude-result-prefixes="php">
 
     xsl:extension-element-prefixes="php"
     exclude-result-prefixes="php">
 

-    <xsl:param name="generateEnclosure"/>
+    <xsl:param name="generate-enclosure"/>

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


@@ -32,14 +32,22 @@
         <xsl:text>https://instagram.com</xsl:text>
     </xsl:variable>
 
         <xsl:text>https://instagram.com</xsl:text>
     </xsl:variable>
 

-    <xsl:template match="display_src">
-        <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(text()))"/>
-    </xsl:template>
+    <xsl:variable name="user-name" select="//ProfilePage/user/username"/>

 
 

-    <xsl:variable name="screen-name" select="//ProfilePage/XML_Serializer_Tag/user/full_name"/>
-    <xsl:variable name="user-name" select="//ProfilePage/XML_Serializer_Tag/user/username"/>
+    <!-- Some users do not specify the full name -->
+    <xsl:variable name="full-name" select="//ProfilePage/user/full_name"/>
+    <xsl:variable name="screen-name">
+        <xsl:choose>
+            <xsl:when test="$full-name != ''">
+                <xsl:value-of select="$full-name"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$user-name"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>

 
 

-    <xsl:template match="//media/nodes/XML_Serializer_Tag">
+    <xsl:template match="//ProfilePage/user/media/nodes">

         <xsl:variable name="item-content-image" select="./display_src"/>
         <xsl:variable name="item-content-caption" select="./caption"/>
         <xsl:variable name="item-permalink" select="concat($BaseURL, '/p/', ./code, '/')"/>
         <xsl:variable name="item-content-image" select="./display_src"/>
         <xsl:variable name="item-content-caption" select="./caption"/>
         <xsl:variable name="item-permalink" select="concat($BaseURL, '/p/', ./code, '/')"/>


@@ -67,28 +75,28 @@
             </guid>
             <pubDate>
                 <xsl:variable name="timestamp" select="./date"/>
             </guid>
             <pubDate>
                 <xsl:variable name="timestamp" select="./date"/>

-                <xsl:value-of select="php:functionString('Tweeper::epoch_to_gmdate', number($timestamp))"/>
+                <xsl:value-of select="php:functionString('Tweeper::epochToRssDate', $timestamp)"/>

             </pubDate>
             <description>
                 <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
                 <p>
                     <xsl:if test="./is_video/text() = 1">
             </pubDate>
             <description>
                 <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
                 <p>
                     <xsl:if test="./is_video/text() = 1">

-                        (Video) 
+                        (Video)

                     </xsl:if>
                     <xsl:value-of select="$item-content-caption"/>
                 </p><br />
                     </xsl:if>
                     <xsl:value-of select="$item-content-caption"/>
                 </p><br />

-                <a href="{$item-permalink}"><img src="{$item-content-image}" /></a>
+                <a href="{$item-permalink}"><img src="{$item-content-image}" style="max-width: 100%"/></a>

                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
             </description>
                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
             </description>

-            <xsl:if test="$generateEnclosure = 1">
-                <xsl:apply-templates select="./display_src"/>
+            <xsl:if test="$generate-enclosure = 1">
+                <xsl:copy-of select="php:functionString('Tweeper::generateEnclosure', $item-content-image)"/>

             </xsl:if>
         </item>
     </xsl:template>
 
     <xsl:template match="/">
         <xsl:variable name="channel-title" select="concat('Instagram / ', $screen-name)"/>
             </xsl:if>
         </item>
     </xsl:template>
 
     <xsl:template match="/">
         <xsl:variable name="channel-title" select="concat('Instagram / ', $screen-name)"/>

-        <xsl:variable name="channel-link" select="concat($BaseURL, //__path)"/>
+        <xsl:variable name="channel-link" select="concat($BaseURL, '/', $user-name)"/>

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


@@ -117,10 +125,10 @@
                         <xsl:value-of select="$channel-link"/>
                     </link>
                     <url>
                         <xsl:value-of select="$channel-link"/>
                     </link>
                     <url>

-                        <xsl:value-of select="//user/profile_pic_url"/>
+                        <xsl:value-of select="//ProfilePage/user/profile_pic_url"/>

                     </url>
                 </image>
                     </url>
                 </image>

-                <xsl:apply-templates select="//media/nodes/XML_Serializer_Tag"/>
+                <xsl:apply-templates select="//ProfilePage/user/media/nodes"/>

             </channel>
         </rss>
     </xsl:template>
             </channel>
         </rss>
     </xsl:template>