xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* bring back cache-busting for feed icons based on timestamp

Browse Source 
* DiskCache: use singleton pattern to create less cache object instances
 * DiskCache: implement ETag
This commit is contained in:
Andrew Dolgov
2022-12-19 21:36:50 +03:00
parent 20d6aaa9ab
commit d373b7b452
10 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
classes/pref/feeds.php
View File

@@ -455,7 +455,7 @@ class Pref_Feeds extends Handler_Protected {
function removeIcon(): void {
$feed_id = (int) $_REQUEST["feed_id"];
$cache = new DiskCache('feed-icons');
$cache = DiskCache::instance('feed-icons');
$feed = ORM::for_table('ttrss_feeds')
->where('owner_uid', $_SESSION['uid'])
@@ -487,7 +487,7 @@ class Pref_Feeds extends Handler_Protected {
if ($feed && $tmp_file && move_uploaded_file($_FILES['icon_file']['tmp_name'], $tmp_file)) {
if (filesize($tmp_file) < Config::get(Config::MAX_FAVICON_FILE_SIZE)) {
$cache = new DiskCache('feed-icons');
$cache = DiskCache::instance('feed-icons');
if ($cache->put((string)$feed_id, file_get_contents($tmp_file))) {
@@ -514,7 +514,8 @@ class Pref_Feeds extends Handler_Protected {
if (file_exists($tmp_file))
unlink($tmp_file);
print json_encode(['rc' => $rc, 'icon_url' => Feeds::_get_icon($feed_id)]);
print json_encode(['rc' => $rc, 'icon_url' =>
Feeds::_get_icon($feed_id) . "?ts=" . time() ]);
}
function editfeed(): void {
@@ -1188,7 +1189,7 @@ class Pref_Feeds extends Handler_Protected {
$pdo->commit();
$favicon_cache = new DiskCache('feed-icons');
$favicon_cache = DiskCache::instance('feed-icons');
if ($favicon_cache->exists((string)$id))
$favicon_cache->remove((string)$id);