From 418a70b2a670d8ba0ab6c15fa5faa41f6be55e53 Mon Sep 17 00:00:00 2001 From: Yassine Doghri Date: Sun, 23 Jan 2022 19:00:08 +0000 Subject: [PATCH] fix(cache): suffix cache names with authenticated for credits, map and pages --- app/Controllers/CreditsController.php | 8 ++++++-- app/Controllers/EpisodeCommentController.php | 2 +- app/Controllers/MapController.php | 14 +++++++++++--- app/Controllers/PageController.php | 14 +++++++++++--- app/Controllers/PodcastController.php | 6 +++--- app/Controllers/PostController.php | 2 +- app/Helpers/components_helper.php | 1 - app/Views/Components/Forms/Field.php | 4 ++-- themes/cp_app/episode/_layout.php | 6 +++--- themes/cp_app/episode/_partials/card.php | 2 +- themes/cp_app/episode/_partials/preview_card.php | 2 +- themes/cp_app/home.php | 16 ++++++---------- themes/cp_app/podcast/about.php | 4 ++-- 13 files changed, 48 insertions(+), 33 deletions(-) diff --git a/app/Controllers/CreditsController.php b/app/Controllers/CreditsController.php index 3531b3e2..5d20669e 100644 --- a/app/Controllers/CreditsController.php +++ b/app/Controllers/CreditsController.php @@ -20,9 +20,12 @@ class CreditsController extends BaseController { $locale = service('request') ->getLocale(); - $allPodcasts = (new PodcastModel())->findAll(); - $cacheName = "page_credits_{$locale}"; + $cacheName = implode( + '_', + array_filter(['page', 'credits', $locale, can_user_interact() ? 'authenticated' : null]), + ); + if (! ($found = cache($cacheName))) { $page = new Page([ 'title' => lang('Person.credits', [], $locale), @@ -30,6 +33,7 @@ class CreditsController extends BaseController 'content_markdown' => '', ]); + $allPodcasts = (new PodcastModel())->findAll(); $allCredits = (new CreditModel())->findAll(); // Unlike the carpenter, we make a tree from a table: diff --git a/app/Controllers/EpisodeCommentController.php b/app/Controllers/EpisodeCommentController.php index 61fb6bac..e0753ce9 100644 --- a/app/Controllers/EpisodeCommentController.php +++ b/app/Controllers/EpisodeCommentController.php @@ -90,7 +90,7 @@ class EpisodeCommentController extends BaseController "comment#{$this->comment->id}", service('request') ->getLocale(), - can_user_interact() ? '_authenticated' : null, + can_user_interact() ? 'authenticated' : null, ]), ); diff --git a/app/Controllers/MapController.php b/app/Controllers/MapController.php index 785a1352..4e468389 100644 --- a/app/Controllers/MapController.php +++ b/app/Controllers/MapController.php @@ -17,9 +17,17 @@ class MapController extends BaseController { public function index(): string { - $locale = service('request') - ->getLocale(); - $cacheName = "page_map_{$locale}"; + $cacheName = implode( + '_', + array_filter([ + 'page', + 'map', + service('request') + ->getLocale(), + can_user_interact() ? 'authenticated' : null, + ]), + ); + if (! ($found = cache($cacheName))) { $found = view('pages/map', [], [ 'cache' => DECADE, diff --git a/app/Controllers/PageController.php b/app/Controllers/PageController.php index a97e4163..03773921 100644 --- a/app/Controllers/PageController.php +++ b/app/Controllers/PageController.php @@ -37,9 +37,17 @@ class PageController extends BaseController public function index(): string { - $locale = service('request') - ->getLocale(); - $cacheName = "page-{$this->page->slug}-{$locale}"; + $cacheName = implode( + '_', + array_filter([ + 'page', + $this->page->slug, + service('request') + ->getLocale(), + can_user_interact() ? 'authenticated' : null, + ]), + ); + if (! ($found = cache($cacheName))) { $data = [ 'metatags' => get_page_metatags($this->page), diff --git a/app/Controllers/PodcastController.php b/app/Controllers/PodcastController.php index 71c5c283..75b78def 100644 --- a/app/Controllers/PodcastController.php +++ b/app/Controllers/PodcastController.php @@ -74,7 +74,7 @@ class PodcastController extends BaseController 'activity', service('request') ->getLocale(), - can_user_interact() ? '_authenticated' : null, + can_user_interact() ? 'authenticated' : null, ]), ); @@ -122,7 +122,7 @@ class PodcastController extends BaseController 'about', service('request') ->getLocale(), - can_user_interact() ? '_authenticated' : null, + can_user_interact() ? 'authenticated' : null, ]), ); @@ -188,7 +188,7 @@ class PodcastController extends BaseController $seasonQuery ? 'season' . $seasonQuery : null, service('request') ->getLocale(), - can_user_interact() ? '_authenticated' : null, + can_user_interact() ? 'authenticated' : null, ]), ); diff --git a/app/Controllers/PostController.php b/app/Controllers/PostController.php index 430a1ca0..15b23c16 100644 --- a/app/Controllers/PostController.php +++ b/app/Controllers/PostController.php @@ -81,7 +81,7 @@ class PostController extends FediversePostController "post#{$this->post->id}", service('request') ->getLocale(), - can_user_interact() ? '_authenticated' : null, + can_user_interact() ? 'authenticated' : null, ]), ); diff --git a/app/Helpers/components_helper.php b/app/Helpers/components_helper.php index 7c7073f4..4502c0f2 100644 --- a/app/Helpers/components_helper.php +++ b/app/Helpers/components_helper.php @@ -307,7 +307,6 @@ if (! function_exists('relative_time')) { return << diff --git a/app/Views/Components/Forms/Field.php b/app/Views/Components/Forms/Field.php index 8f81fc24..8467df64 100644 --- a/app/Views/Components/Forms/Field.php +++ b/app/Views/Components/Forms/Field.php @@ -37,8 +37,8 @@ class Field extends FormComponent unset($fieldComponentAttributes['as']); unset($fieldComponentAttributes['label']); unset($fieldComponentAttributes['class']); - unset($fieldComponentAttributes['helperText']); - unset($fieldComponentAttributes['hintText']); + unset($fieldComponentAttributes['helper']); + unset($fieldComponentAttributes['hint']); $fieldComponentAttributes['class'] = 'mb-1'; diff --git a/themes/cp_app/episode/_layout.php b/themes/cp_app/episode/_layout.php index 8fb8aeca..19149506 100644 --- a/themes/cp_app/episode/_layout.php +++ b/themes/cp_app/episode/_layout.php @@ -91,7 +91,7 @@
persons !== []): ?>