refactor(reddit) (#3869)

* refactor

* yup

* fix also reporterre

bridges/RedditBridge.php

@@ -173,7 +173,7 @@ class RedditBridge extends BridgeAbstract
                 $item['author'] = $data->author;
                 $item['uid'] = $data->id;
                 $item['timestamp'] = $data->created_utc;
-                $item['uri'] = $this->encodePermalink($data->permalink);
+                $item['uri'] = $this->urlEncodePathParts($data->permalink);
 
                 $item['categories'] = [];
 
@@ -193,13 +193,11 @@ class RedditBridge extends BridgeAbstract
                 if ($post->kind == 't1') {
                     // Comment
 
-                    $item['content']
+                    $item['content'] = htmlspecialchars_decode($data->body_html);
-                        = htmlspecialchars_decode($data->body_html);
                 } elseif ($data->is_self) {
                     // Text post
 
-                    $item['content']
+                    $item['content'] = htmlspecialchars_decode($data->selftext_html);
-                        = htmlspecialchars_decode($data->selftext_html);
                 } elseif (isset($data->post_hint) && $data->post_hint == 'link') {
                     // Link with preview
 
@@ -215,18 +213,11 @@ class RedditBridge extends BridgeAbstract
                         $embed = '';
                     }
 
-                    $item['content'] = $this->template(
+                    $item['content'] = $this->createFigureLink($data->url, $data->thumbnail, $data->domain) . $embed;
-                        $data->url,
+                } elseif (isset($data->post_hint) && $data->post_hint == 'image') {
-                        $data->thumbnail,
-                        $data->domain
-                    ) . $embed;
-                } elseif (isset($data->post_hint) ? $data->post_hint == 'image' : false) {
                     // Single image
 
-                    $item['content'] = $this->link(
+                    $item['content'] = $this->createLink($this->urlEncodePathParts($data->permalink), '<img src="' . $data->url . '" />');
-                        $this->encodePermalink($data->permalink),
-                        '<img src="' . $data->url . '" />'
-                    );
                 } elseif ($data->is_gallery ?? false) {
                     // Multiple images
 
@@ -246,32 +237,18 @@ class RedditBridge extends BridgeAbstract
                     end($data->preview->images[0]->resolutions);
                     $index = key($data->preview->images[0]->resolutions);
 
-                    $item['content'] = $this->template(
+                    $item['content'] = $this->createFigureLink($data->url, $data->preview->images[0]->resolutions[$index]->url, 'Video');
-                        $data->url,
+                } elseif (isset($data->media) && $data->media->type == 'youtube.com') {
-                        $data->preview->images[0]->resolutions[$index]->url,
-                        'Video'
-                    );
-                } elseif (isset($data->media) ? $data->media->type == 'youtube.com' : false) {
                     // Youtube link
-
+                    $item['content'] = $this->createFigureLink($data->url, $data->media->oembed->thumbnail_url, 'YouTube');
-                    $item['content'] = $this->template(
+                    //$item['content'] = htmlspecialchars_decode($data->media->oembed->html);
-                        $data->url,
-                        $data->media->oembed->thumbnail_url,
-                        'YouTube'
-                    );
                 } elseif (explode('.', $data->domain)[0] == 'self') {
                     // Crossposted text post
                     // TODO (optionally?) Fetch content of the original post.
-
+                    $item['content'] = $this->createLink($this->urlEncodePathParts($data->permalink), 'Crossposted from r/' . explode('.', $data->domain)[1]);
-                    $item['content'] = $this->link(
-                        $this->encodePermalink($data->permalink),
-                        'Crossposted from r/'
-                        . explode('.', $data->domain)[1]
-                    );
                 } else {
                     // Link WITHOUT preview
-
+                    $item['content'] = $this->createLink($data->url, $data->domain);
-                    $item['content'] = $this->link($data->url, $data->domain);
                 }
 
                 $this->items[] = $item;
@@ -279,7 +256,7 @@ class RedditBridge extends BridgeAbstract
         }
         // Sort the order to put the latest posts first, even for mixed subreddits
         usort($this->items, function ($a, $b) {
-            return $a['timestamp'] < $b['timestamp'];
+            return $b['timestamp'] <=> $a['timestamp'];
         });
     }
 
@@ -299,24 +276,19 @@ class RedditBridge extends BridgeAbstract
         }
     }
 
-    private function encodePermalink($link)
+    private function urlEncodePathParts($link)
     {
-        return self::URI . implode(
+        return self::URI . implode('/', array_map('urlencode', explode('/', $link)));
-            '/',
-            array_map('urlencode', explode('/', $link))
-        );
     }
 
-    private function template($href, $src, $caption)
+    private function createFigureLink($href, $src, $caption)
     {
-        return '<a href="' . $href . '"><figure><figcaption>'
+        return sprintf('<a href="%s"><figure><figcaption>%s</figcaption><img src="%s"/></figure></a>', $href, $caption, $src);
-            . $caption . '</figcaption><img src="'
-            . $src . '"/></figure></a>';
     }
 
-    private function link($href, $text)
+    private function createLink($href, $text)
     {
-        return '<a href="' . $href . '">' . $text . '</a>';
+        return sprintf('<a href="%s">%s</a>', $href, $text);
     }
 
     public function detectParameters($url)

bridges/ReporterreBridge.php

@@ -1,11 +1,35 @@
 <?php
 
+/**
+ * See https://reporterre.net/spip.php?page=backend-simple
+ */
 class ReporterreBridge extends BridgeAbstract
 {
     const MAINTAINER = 'nyutag';
     const NAME = 'Reporterre Bridge';
     const URI = 'https://www.reporterre.net/';
-    const DESCRIPTION = 'Returns the newest articles.';
+    const DESCRIPTION = 'Returns the newest articles. See also their official feed https://reporterre.net/spip.php?page=backend-simple';
+
+    public function collectData()
+    {
+        //$url = self::URI . 'spip.php?page=backend';
+        $url = self::URI . 'spip.php?page=backend-simple';
+        $html = getSimpleHTMLDOM($url);
+        $limit = 0;
+
+        foreach ($html->find('item') as $element) {
+            if ($limit < 5) {
+                $item = [];
+                $item['title'] = html_entity_decode($element->find('title', 0)->plaintext);
+                $item['timestamp'] = strtotime($element->find('dc:date', 0)->plaintext);
+                $item['uri'] = $element->find('guid', 0)->innertext;
+                //$item['content'] = html_entity_decode($this->extractContent($item['uri']));
+                $item['content'] = htmlspecialchars_decode($element->find('description', 0)->plaintext);
+                $this->items[] = $item;
+                $limit++;
+            }
+        }
+    }
 
     private function extractContent($url)
     {
@@ -22,22 +46,4 @@ class ReporterreBridge extends BridgeAbstract
         $text = strip_tags($text, '<p><br><a><img>');
         return $text;
     }
-
-    public function collectData()
-    {
-        $html = getSimpleHTMLDOM(self::URI . 'spip.php?page=backend');
-        $limit = 0;
-
-        foreach ($html->find('item') as $element) {
-            if ($limit < 5) {
-                $item = [];
-                $item['title'] = html_entity_decode($element->find('title', 0)->plaintext);
-                $item['timestamp'] = strtotime($element->find('dc:date', 0)->plaintext);
-                $item['uri'] = $element->find('guid', 0)->innertext;
-                $item['content'] = html_entity_decode($this->extractContent($item['uri']));
-                $this->items[] = $item;
-                $limit++;
-            }
-        }
-    }
 }