X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/eafac3f425aa88b42e6a496b62304848d5bbb4a9..d831bbec69bfdbd12ce7774be02eb224cfe41d3b:/rss_converter_instagram.com.xsl

diff --git a/rss_converter_instagram.com.xsl b/rss_converter_instagram.com.xsl
index f42ca8b..4f1d14f 100644
--- a/rss_converter_instagram.com.xsl
+++ b/rss_converter_instagram.com.xsl
@@ -32,20 +32,31 @@
         <xsl:text>https://instagram.com</xsl:text>
     </xsl:variable>
 
-    <xsl:template match="images">
-        <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(./standard_resolution/url))"/>
+    <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="screen-name" select="//UserProfile/XML_Serializer_Tag/user/full_name"/>
-    <xsl:variable name="user-name" select="//UserProfile/XML_Serializer_Tag/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"/>
 
-    <xsl:template match="//userMedia/XML_Serializer_Tag">
-        <xsl:variable name="item-content-title" select="./caption/text"/>
-        <xsl:variable name="item-content-src" select="./images/standard_resolution/url"/>
-        <xsl:variable name="item-permalink" select="./link"/>
+    <xsl:template match="//media/nodes/XML_Serializer_Tag">
+        <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, '/')"/>
         <item>
             <title>
-                <xsl:value-of select="concat($user-name, ': ', $item-content-title)"/>
+                <xsl:variable name="title-length" select="140"/>
+                <!-- ellipsize, inspired from http://stackoverflow.com/questions/13622338 -->
+                <xsl:choose>
+                    <xsl:when test="string-length($item-content-caption) > $title-length">
+                        <xsl:variable name="truncated-length" select="$title-length - 3"/>
+                        <xsl:value-of select="normalize-space(substring($item-content-caption, 1, $truncated-length))"/>
+                        <xsl:text>...</xsl:text>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="normalize-space($item-content-caption)"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </title>
             <link>
                 <xsl:value-of select="$item-permalink"/>
@@ -54,24 +65,29 @@
                 <xsl:value-of select="$item-permalink"/>
             </guid>
             <pubDate>
-                <xsl:variable name="timestamp" select="./created_time"/>
+                <xsl:variable name="timestamp" select="./date"/>
                 <xsl:value-of select="php:functionString('Tweeper::epoch_to_gmdate', number($timestamp))"/>
             </pubDate>
             <description>
                 <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
-                <p><xsl:value-of select="$item-content-title"/></p><br />
-                <img src="{$item-content-src}" title="{$item-content-title}" />
+                <p>
+                    <xsl:if test="./is_video/text() = 1">
+                        (Video) 
+                    </xsl:if>
+                    <xsl:value-of select="$item-content-caption"/>
+                </p><br />
+                <a href="{$item-permalink}"><img src="{$item-content-image}" /></a>
                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
             </description>
             <xsl:if test="$generateEnclosure = 1">
-                <xsl:apply-templates select="./images"/>
+                <xsl:apply-templates select="./display_src"/>
             </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, //user/__path)"/>
+        <xsl:variable name="channel-link" select="concat($BaseURL, //__path)"/>
 
         <rss version="2.0">
             <xsl:attribute name="xml:base"><xsl:value-of select="$BaseURL" /></xsl:attribute>
@@ -84,7 +100,7 @@
                     <xsl:value-of select="$channel-link"/>
                 </link>
                 <description>
-                    <xsl:value-of select="//user/bio"/>
+                    <xsl:value-of select="//user/biography"/>
                 </description>
                 <image>
                     <title>
@@ -94,10 +110,10 @@
                         <xsl:value-of select="$channel-link"/>
                     </link>
                     <url>
-                        <xsl:value-of select="//user/profile_picture"/>
+                        <xsl:value-of select="//user/profile_pic_url"/>
                     </url>
                 </image>
-                <xsl:apply-templates select="//userMedia/XML_Serializer_Tag"/>
+                <xsl:apply-templates select="//media/nodes/XML_Serializer_Tag"/>
             </channel>
         </rss>
     </xsl:template>