X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/3af52fa729dd3790dcd6512b5c1e7c7226e41331..47350899b24fb9a79bd9f57bcabc7281b9a01e34:/rss_converter_instagram.com.xsl

diff --git a/rss_converter_instagram.com.xsl b/rss_converter_instagram.com.xsl
index c4fda61..3efba4d 100644
--- a/rss_converter_instagram.com.xsl
+++ b/rss_converter_instagram.com.xsl
@@ -32,10 +32,6 @@
         <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::generateEnclosure', string(text()))"/>
-    </xsl:template>
-
     <xsl:variable name="user-name" select="//ProfilePage/user/username"/>
 
     <!-- Some users do not specify the full name -->
@@ -51,7 +47,7 @@
         </xsl:choose>
     </xsl:variable>
 
-    <xsl:template match="//media/nodes">
+    <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, '/')"/>
@@ -79,7 +75,7 @@
             </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>
@@ -89,18 +85,18 @@
                     </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:if test="$generate-enclosure = 1">
-                <xsl:apply-templates select="./display_src"/>
+                <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: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>
@@ -129,10 +125,10 @@
                         <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>
-                <xsl:apply-templates select="//media/nodes"/>
+                <xsl:apply-templates select="//ProfilePage/user/media/nodes"/>
             </channel>
         </rss>
     </xsl:template>