From 857257865c00325fa6b1e2cfeadf319d412a2637 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 28 Aug 2019 22:46:09 +0000 Subject: [PATCH] Style fix --- app/Models/Predb.php | 3 ++- app/Models/Release.php | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/Models/Predb.php b/app/Models/Predb.php index 75eebd845..d407298c5 100644 --- a/app/Models/Predb.php +++ b/app/Models/Predb.php @@ -6,8 +6,8 @@ use Blacklight\ColorCLI; use Illuminate\Support\Arr; use Blacklight\ConsoleTools; use Blacklight\SphinxSearch; -use Illuminate\Support\Facades\Cache; use Laravel\Scout\Searchable; +use Illuminate\Support\Facades\Cache; use Illuminate\Database\Eloquent\Model; /** @@ -194,6 +194,7 @@ class Predb extends Model $predb = $sql->paginate(config('nntmux.items_per_page')); Cache::put(md5($search), $predb, $expiresAt); + return $predb; } diff --git a/app/Models/Release.php b/app/Models/Release.php index 01a30b685..af910c86b 100644 --- a/app/Models/Release.php +++ b/app/Models/Release.php @@ -5,8 +5,8 @@ namespace App\Models; use Blacklight\NZB; use Blacklight\SphinxSearch; use Conner\Tagging\Taggable; -use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Cache; use Illuminate\Database\Eloquent\Model; /** @@ -382,11 +382,11 @@ class Release extends Model */ public static function getTopDownloads() { - $expiresAt = now()->addMinutes(config('nntmux.cache_expiry_long')); - $releases = Cache::get(md5('topDownloads')); - if ($releases !== null) { - return $releases; - } + $expiresAt = now()->addMinutes(config('nntmux.cache_expiry_long')); + $releases = Cache::get(md5('topDownloads')); + if ($releases !== null) { + return $releases; + } $releases = self::query() ->where('grabs', '>', 0) ->select(['id', 'searchname', 'guid', 'adddate']) @@ -397,9 +397,9 @@ class Release extends Model ->limit(10) ->get(); - Cache::put(md5('topDownloads'), $releases, $expiresAt); + Cache::put(md5('topDownloads'), $releases, $expiresAt); - return $releases; + return $releases; } /** @@ -438,7 +438,7 @@ class Release extends Model return $releases; } - $releases = self::query() + $releases = self::query() ->where('nzbstatus', '=', NZB::NZB_ADDED) ->select(['releases.*', 'g.name as group_name', 'c.title as category_name'])