Merge tag 'v1.2.0' into debian/master

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

diff --git a/src/rss_converter_facebook.com.xsl b/src/rss_converter_facebook.com.xsl
index fc4f272..520d6ce 100644 (file)
--- a/src/rss_converter_facebook.com.xsl
+++ b/src/rss_converter_facebook.com.xsl
@@ -52,7 +52,7 @@
         name="page-id"
         select="substring-after(//meta[@property='al:android:url']/@content, 'fb://page/')"/>
 
         name="page-id"
         select="substring-after(//meta[@property='al:android:url']/@content, 'fb://page/')"/>
 

-    <xsl:template match="//div[contains(@class, 'fbUserContent')]">
+    <xsl:template match="//div[contains(@class, 'fbUserStory') or contains(@class, 'userContentWrapper')]">

         <xsl:variable name="story-id" select=".//input[@name='ft_ent_identifier']/@value"/>
         <xsl:variable
             name="item-permalink"
         <xsl:variable name="story-id" select=".//input[@name='ft_ent_identifier']/@value"/>
         <xsl:variable
             name="item-permalink"


@@ -106,8 +106,8 @@
 
     <xsl:template match="/">
         <xsl:variable name="channel-title" select="//title"/>
 
     <xsl:template match="/">
         <xsl:variable name="channel-title" select="//title"/>

-        <xsl:variable name="channel-link" select="//div[contains(@class, 'fbUserContent')][1]//a[1]/@href"/>
-        <xsl:variable name="channel-image" select="//div[contains(@class, 'fbUserContent')][1]//a[1]//img/@src"/>
+        <xsl:variable name="channel-link" select="//meta[@property='og:url']/@content"/>
+        <xsl:variable name="channel-image" select="//meta[@property='og:image']/@content"/>

 
         <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>


@@ -121,7 +121,7 @@
                 </link>
                 <description>
                     <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
                 </link>
                 <description>
                     <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>

-                    <xsl:copy-of select="//div[@data-id='1']/node()"/>
+                    <xsl:value-of select="//meta[@property='og:description']/@content"/>

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


@@ -135,7 +135,7 @@
                         <xsl:value-of select="$channel-image"/>
                     </url>
                 </image>
                         <xsl:value-of select="$channel-image"/>
                     </url>
                 </image>

-                <xsl:apply-templates select="//div[contains(@class, 'fbUserContent')]"/>
+                <xsl:apply-templates select="//div[contains(@class, 'fbUserStory') or contains(@class, 'userContentWrapper')]"/>

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