fix(dribble) (RSS-Bridge#4044)

User123698745 · Mar 31, 2024 · d5d470c · d5d470c
1 parent 182567e
commit d5d470c
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/bridges/DribbbleBridge.php b/bridges/DribbbleBridge.php
@@ -18,12 +18,12 @@ public function collectData()
     {
         $html = getSimpleHTMLDOM(self::URI);
 
-        $json = $this->loadEmbeddedJsonData($html);
+        $data = $this->fetchData($html);
 
         foreach ($html->find('li[id^="screenshot-"]') as $shot) {
             $item = [];
 
-            $additional_data = $this->findJsonForShot($shot, $json);
+            $additional_data = $this->findJsonForShot($shot, $data);
             if ($additional_data === null) {
                 $item['uri'] = self::URI . $shot->find('a', 0)->href;
                 $item['title'] = $shot->find('.shot-title', 0)->plaintext;
@@ -46,9 +46,8 @@ public function collectData()
         }
     }
 
-    private function loadEmbeddedJsonData($html)
+    private function fetchData($html)
     {
-        $json = [];
         $scripts = $html->find('script');
 
         foreach ($scripts as $script) {
@@ -69,12 +68,17 @@ private function loadEmbeddedJsonData($html)
                 $end = strpos($script->innertext, '];') + 1;
 
                 // convert JSON to PHP array
-                $json = json_decode(substr($script->innertext, $start, $end - $start), true);
-                break;
+                $json = substr($script->innertext, $start, $end - $start);
+
+                try {
+                    // TODO: fix broken json
+                    return Json::decode($json);
+                } catch (\JsonException $e) {
+                    return [];
+                }
             }
         }
-
-        return $json;
+        return [];
     }
 
     private function findJsonForShot($shot, $json)