X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/9be62a86d53f1cdd9f561d35dc1b044ca348acca..cd0835d56d8c7ab3f5c78df71b183f87148d8f88:/src/rss_converter_instagram.com.xsl

diff --git a/src/rss_converter_instagram.com.xsl b/src/rss_converter_instagram.com.xsl
index 238848f..2d54f3d 100644
--- a/src/rss_converter_instagram.com.xsl
+++ b/src/rss_converter_instagram.com.xsl
@@ -32,7 +32,7 @@
         <xsl:text>https://instagram.com</xsl:text>
     </xsl:variable>
 
-    <xsl:variable name="user-name" select="//ProfilePage/user/username"/>
+    <xsl:variable name="user-name" select="//ProfilePage/graphql/user/username"/>
 
     <!--
          NOTE: some users do not specify the full name.
@@ -40,16 +40,14 @@
          Remember to handle this case when using it and fall-back to the plain
          user name when appropriate.
     -->
-    <xsl:variable name="full-name" select="//ProfilePage/user/full_name"/>
+    <xsl:variable name="full-name" select="//ProfilePage/graphql/user/full_name"/>
 
-    <xsl:variable name="location-name" select="//LocationsPage/location/name"/>
+    <xsl:variable name="location-name" select="//LocationsPage/graphql/location/name"/>
 
     <xsl:variable name="screen-name">
         <xsl:choose>
             <xsl:when test="$location-name != ''">
-                <xsl:variable name="location-latitude" select="//LocationsPage/location/lat"/>
-                <xsl:variable name="location-longitude" select="//LocationsPage/location/lng"/>
-                <xsl:value-of select="concat($location-name, ' (', $location-latitude, ', ', $location-longitude, ')')"/>
+                <xsl:value-of select="$location-name"/>
             </xsl:when>
             <xsl:when test="$full-name != ''">
                 <xsl:value-of select="$full-name"/>
@@ -60,14 +58,14 @@
         </xsl:choose>
     </xsl:variable>
 
-    <xsl:template match="//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:template match="//edges/node">
+        <xsl:variable name="item-content-image" select="./display_url"/>
+        <xsl:variable name="item-content-caption" select="./edge_media_to_caption/edges/node/text"/>
+        <xsl:variable name="item-permalink" select="concat($BaseURL, '/p/', ./shortcode, '/')"/>
         <item>
             <title>
                 <xsl:variable name="title-length" select="140"/>
-                <xsl:variable name="item-content-title" select="normalize-space(concat($user-name, ': ', $item-content-caption))"/>
+                <xsl:variable name="item-content-title" select="normalize-space(concat($screen-name, ': ', $item-content-caption))"/>
                 <!-- ellipsize, inspired from http://stackoverflow.com/questions/13622338 -->
                 <xsl:choose>
                     <xsl:when test="string-length($item-content-title) > $title-length">
@@ -87,7 +85,7 @@
                 <xsl:value-of select="$item-permalink"/>
             </guid>
             <pubDate>
-                <xsl:variable name="timestamp" select="./date"/>
+                <xsl:variable name="timestamp" select="./taken_at_timestamp"/>
                 <xsl:value-of select="php:functionString('Tweeper\Tweeper::epochToRssDate', $timestamp)"/>
             </pubDate>
             <description>
@@ -113,7 +111,7 @@
         <xsl:variable name="channel-link">
             <xsl:choose>
                 <xsl:when test="$location-name != ''">
-                    <xsl:variable name="location-id" select="//LocationsPage/location/id"/>
+                    <xsl:variable name="location-id" select="//LocationsPage/graphql/location/id"/>
                     <xsl:value-of select="concat($BaseURL, '/explore/locations/', $location-id)"/>
                 </xsl:when>
                 <xsl:otherwise>
@@ -121,7 +119,7 @@
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
-        <xsl:variable name="channel-image" select="//ProfilePage/user/profile_pic_url"/>
+        <xsl:variable name="channel-image" select="//ProfilePage/graphql/user/profile_pic_url"/>
 
         <rss version="2.0">
             <xsl:attribute name="xml:base"><xsl:value-of select="$BaseURL" /></xsl:attribute>
@@ -136,6 +134,11 @@
                 <description>
                     <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
                     <xsl:value-of select="normalize-space(concat($screen-name, '. ', //user/biography))"/>
+                    <xsl:if test="$location-name != ''">
+                        <xsl:variable name="location-latitude" select="//LocationsPage/graphql/location/lat"/>
+                        <xsl:variable name="location-longitude" select="//LocationsPage/graphql/location/lng"/>
+                        <xsl:value-of select="concat(' (', $location-latitude, ', ', $location-longitude, ')')"/>
+                    </xsl:if>
                     <xsl:variable name="external-url" select="//user/external_url"/>
                     <xsl:if test="$external-url != ''">
                         <xsl:text> </xsl:text><a href="{$external-url}"><xsl:value-of select="$external-url"/></a>
@@ -155,7 +158,7 @@
                         </url>
                     </image>
                 </xsl:if>
-                <xsl:apply-templates select="//ProfilePage/user/media/nodes|//LocationsPage/location/media/nodes"/>
+                <xsl:apply-templates select="//ProfilePage/graphql/user/edge_owner_to_timeline_media/edges/node|//LocationsPage/graphql/location/edge_location_to_media/edges/node"/>
             </channel>
         </rss>
     </xsl:template>