From c6f09e1ae46421a5089ec2626b49148dc457cfd9 Mon Sep 17 00:00:00 2001 From: CarelessCaution Date: Fri, 9 May 2025 16:41:31 -0500 Subject: Fix favicon hashing in GReader API (#7573) * Fix favicon hashing in GReader API (#7570) This allows the correct iconUrl to be returned from the GReader API for a given feed. * Fix method signature * Fix Fever API --------- Co-authored-by: CarelessCaution <189675655+CarelessCaution@users.noreply.github.com> Co-authored-by: Alexandre Alapetite --- p/api/fever.php | 2 +- p/api/greader.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'p/api') diff --git a/p/api/fever.php b/p/api/fever.php index 2ef3e4f9a..6251842e7 100644 --- a/p/api/fever.php +++ b/p/api/fever.php @@ -360,7 +360,7 @@ final class FeverAPI $myFeeds = $this->feedDAO->listFeeds(); foreach ($myFeeds as $feed) { - $id = hash('crc32b', $salt . $feed->url()); + $id = $feed->hashFavicon(); $filename = DATA_PATH . '/favicons/' . $id . '.ico'; if (!file_exists($filename)) { continue; diff --git a/p/api/greader.php b/p/api/greader.php index 2a925f2a5..00bcf10f2 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -353,7 +353,7 @@ final class GReaderAPI { //'firstitemmsec' => 0, 'url' => htmlspecialchars_decode($feed->url(), ENT_QUOTES), 'htmlUrl' => htmlspecialchars_decode($feed->website(), ENT_QUOTES), - 'iconUrl' => $faviconsUrl . hash('crc32b', $salt . $feed->url()), + 'iconUrl' => $faviconsUrl . $feed->hashFavicon(), ]; } } -- cgit v1.2.3