fixed special char encoding of feed item descriptions

Kaishiyoku · Jun 4, 2023 · 3b86427 · 3b86427
1 parent 5d7c6c8
commit 3b86427
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Helper.php b/src/Helper.php
@@ -152,4 +152,13 @@ public static function trimStringCollection(Collection $collection): Collection
         /** @phpstan-ignore-next-line */
         return $collection->map(fn($category) => Helper::trimOrDefaultNull($category))->filter();
     }
+
+    public static function entityDecode(string $encoding, ?string $str): ?string
+    {
+        if (!$str) {
+            return $str;
+        }
+
+        return html_entity_decode($str, ENT_QUOTES | ENT_HTML5, $encoding);
+    }
 }
diff --git a/src/Models/Rss/FeedItem.php b/src/Models/Rss/FeedItem.php
@@ -317,7 +317,8 @@ public static function fromZendFeedItem(EntryInterface $zendFeedItem, Client $ht
 
         $feedItem = new self();
 
-        $content = html_entity_decode($zendFeedItem->getContent(), ENT_QUOTES | ENT_HTML5, $zendFeedItem->getEncoding());
+        $content = Helper::entityDecode($zendFeedItem->getEncoding(), $zendFeedItem->getContent());
+        $description = Helper::entityDecode($zendFeedItem->getEncoding(), $zendFeedItem->getDescription());
         $imageUrls = $zendFeedItem->getPermalink() ? Helper::getImageUrlsForFeedItem($zendFeedItem->getPermalink(), $content, $httpClient) : new Collection();
 
         $feedItem->setCategories(new Collection($zendFeedItem->getCategories()->getValues()));
@@ -340,7 +341,7 @@ public static function fromZendFeedItem(EntryInterface $zendFeedItem, Client $ht
         $feedItem->setContent($content);
         $feedItem->setCreatedAt($zendFeedItem->getDateCreated() == null ? null : Carbon::parse($zendFeedItem->getDateCreated()));
         $feedItem->setUpdatedAt($zendFeedItem->getDateModified() == null ? null : Carbon::parse($zendFeedItem->getDateModified()));
-        $feedItem->setDescription($zendFeedItem->getDescription());
+        $feedItem->setDescription($description);
         $feedItem->setEnclosureUrl(optional($zendFeedItem->getEnclosure(), fn($enclosure) => $enclosure->url));
         $feedItem->setImageUrls($imageUrls);
         $feedItem->setEncoding($zendFeedItem->getEncoding());