rss_converter_instagram.com.xsl: don't put location coordinates in screen name

[tweeper.git] / src / rss_converter_instagram.com.xsl

diff --git a/src/rss_converter_instagram.com.xsl b/src/rss_converter_instagram.com.xsl
index 4045224..2d54f3d 100644 (file)
--- a/src/rss_converter_instagram.com.xsl
+++ b/src/rss_converter_instagram.com.xsl
@@ -47,9 +47,7 @@
     <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"/>
@@ -67,7 +65,7 @@
         <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">
@@ -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>