From 72918a4b09b95a6cd2f3f6ba0d410e5fce929c89 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 12 Mar 2022 23:32:31 -0700 Subject: [PATCH] Update InstanceService, define cache keys --- app/Http/Controllers/Admin/AdminInstanceController.php | 7 ++++--- app/Services/InstanceService.php | 10 +++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Admin/AdminInstanceController.php b/app/Http/Controllers/Admin/AdminInstanceController.php index ddb6e777f..b24592c31 100644 --- a/app/Http/Controllers/Admin/AdminInstanceController.php +++ b/app/Http/Controllers/Admin/AdminInstanceController.php @@ -7,6 +7,7 @@ use App\{Instance, Profile}; use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Validation\Rule; +use App\Services\InstanceService; trait AdminInstanceController { @@ -126,9 +127,9 @@ trait AdminInstanceController break; } - Cache::forget('instances:banned:domains'); - Cache::forget('instances:unlisted:domains'); - Cache::forget('instances:auto_cw:domains'); + Cache::forget(InstanceService::CACHE_KEY_BANNED_DOMAINS); + Cache::forget(InstanceService::CACHE_KEY_UNLISTED_DOMAINS); + Cache::forget(InstanceService::CACHE_KEY_NSFW_DOMAINS); return response()->json([]); } diff --git a/app/Services/InstanceService.php b/app/Services/InstanceService.php index c95b6ac25..2b253e233 100644 --- a/app/Services/InstanceService.php +++ b/app/Services/InstanceService.php @@ -7,6 +7,10 @@ use App\Instance; class InstanceService { + const CACHE_KEY_BANNED_DOMAINS = 'instances:banned:domains'; + const CACHE_KEY_UNLISTED_DOMAINS = 'instances:unlisted:domains'; + const CACHE_KEY_NSFW_DOMAINS = 'instances:auto_cw:domains'; + public static function getByDomain($domain) { return Cache::remember('pf:services:instance:by_domain:'.$domain, 3600, function() use($domain) { @@ -16,21 +20,21 @@ class InstanceService public static function getBannedDomains() { - return Cache::remember('instances:banned:domains', now()->addHours(12), function() { + return Cache::remember(self::CACHE_KEY_BANNED_DOMAINS, now()->addHours(12), function() { return Instance::whereBanned(true)->pluck('domain')->toArray(); }); } public static function getUnlistedDomains() { - return Cache::remember('instances:unlisted:domains', now()->addHours(12), function() { + return Cache::remember(self::CACHE_KEY_UNLISTED_DOMAINS, now()->addHours(12), function() { return Instance::whereUnlisted(true)->pluck('domain')->toArray(); }); } public static function getNsfwDomains() { - return Cache::remember('instances:auto_cw:domains', now()->addHours(12), function() { + return Cache::remember(self::CACHE_KEY_NSFW_DOMAINS, now()->addHours(12), function() { return Instance::whereAutoCw(true)->pluck('domain')->toArray(); }); }