From 0faefd419b470c350a6d8a976c9071dd61b8c17e Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 30 Mar 2023 14:15:08 +0000 Subject: [PATCH] Streamline calls to `orderBy` --- Blacklight/Books.php | 2 +- Blacklight/Nfo.php | 2 +- Blacklight/processing/tv/TV.php | 2 +- app/Http/Controllers/Admin/AdminSiteController.php | 2 +- app/Http/Controllers/Api/RSS.php | 2 +- app/Models/Category.php | 2 +- app/Models/Forumpost.php | 4 ++-- app/Models/Release.php | 8 ++++---- app/Models/ReleaseComment.php | 6 +++--- app/Models/UsenetGroup.php | 2 +- app/Models/User.php | 4 ++-- app/Models/UserDownload.php | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Blacklight/Books.php b/Blacklight/Books.php index f723578e7..4bf24457a 100755 --- a/Blacklight/Books.php +++ b/Blacklight/Books.php @@ -276,7 +276,7 @@ class Books Release::query()->where('nzbstatus', '=', NZB::NZB_ADDED) ->whereNull('bookinfo_id') ->whereIn('categories_id', [$iValue]) - ->orderBy('postdate', 'desc') + ->orderByDesc('postdate') ->limit($this->bookqty) ->get(['searchname', 'id', 'categories_id']), $iValue ); diff --git a/Blacklight/Nfo.php b/Blacklight/Nfo.php index 796af1c65..5fb2df4e2 100755 --- a/Blacklight/Nfo.php +++ b/Blacklight/Nfo.php @@ -265,7 +265,7 @@ class Nfo $res = $qry ->orderBy('nfostatus') - ->orderBy('postdate', 'desc') + ->orderByDesc('postdate') ->limit($this->nzbs) ->get(['id', 'guid', 'groups_id', 'name']); diff --git a/Blacklight/processing/tv/TV.php b/Blacklight/processing/tv/TV.php index 24ba5da99..2817456c8 100755 --- a/Blacklight/processing/tv/TV.php +++ b/Blacklight/processing/tv/TV.php @@ -157,7 +157,7 @@ abstract class TV extends Videos ->where('size', '>', 1048576) ->whereBetween('categories_id', [Category::TV_ROOT, Category::TV_OTHER]) ->where('categories_id', '<>', Category::TV_ANIME) - ->orderBy('postdate', 'desc') + ->orderByDesc('postdate') ->limit($this->tvqty); if ($groupID !== '') { $qry->where('groups_id', $groupID); diff --git a/app/Http/Controllers/Admin/AdminSiteController.php b/app/Http/Controllers/Admin/AdminSiteController.php index 3fb4932f6..7749b512d 100644 --- a/app/Http/Controllers/Admin/AdminSiteController.php +++ b/app/Http/Controllers/Admin/AdminSiteController.php @@ -199,7 +199,7 @@ class AdminSiteController extends BasePageController $usersbymonth = User::getUsersByMonth(); $this->smarty->assign('usersbymonth', $usersbymonth); - $usersbyrole = Role::query()->select(['name'])->withCount('users')->groupBy('name')->having('users_count', '>', 0)->orderBy('users_count', 'desc')->get(); + $usersbyrole = Role::query()->select(['name'])->withCount('users')->groupBy('name')->having('users_count', '>', 0)->orderByDesc('users_count')->get(); $this->smarty->assign('usersbyrole', $usersbyrole); $this->smarty->assign('totusers', 0); $this->smarty->assign('totrusers', 0); diff --git a/app/Http/Controllers/Api/RSS.php b/app/Http/Controllers/Api/RSS.php index 9c5ce6ff6..defa94f0f 100644 --- a/app/Http/Controllers/Api/RSS.php +++ b/app/Http/Controllers/Api/RSS.php @@ -213,7 +213,7 @@ class RSS extends ApiController return DB::table($table) ->select([$column]) ->where($column, '>', 0) - ->orderBy($order, 'asc') + ->orderBy($order) ->first(); } } diff --git a/app/Models/Category.php b/app/Models/Category.php index 67a6c7a69..1f73b9c72 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -301,7 +301,7 @@ class Category extends Model ->select(['root_categories_id', DB::raw('COUNT(r.id) as count'), 'title']) ->join('releases as r', 'r.categories_id', '=', 'categories.id') ->groupBy('title') - ->orderBy('count', 'desc') + ->orderByDesc('count') ->get(); Cache::put(md5('RecentlyAdded'), $result, $expiresAt); diff --git a/app/Models/Forumpost.php b/app/Models/Forumpost.php index 5eda05984..f95f498d8 100644 --- a/app/Models/Forumpost.php +++ b/app/Models/Forumpost.php @@ -147,7 +147,7 @@ class Forumpost extends Model ->leftJoin('users', 'users.id', '=', 'forumpost.users_id') ->leftJoin('roles', 'roles.id', '=', 'users.roles_id') ->select(['forumpost.*', 'users.username', 'roles.name as rolename']) - ->orderBy('forumpost.updated_at', 'desc') + ->orderByDesc('forumpost.updated_at') ->paginate(config('nntmux.items_per_page')); } @@ -201,7 +201,7 @@ class Forumpost extends Model ->where('forumpost.users_id', $uid) ->select(['forumpost.*', 'users.username']) ->leftJoin('users', 'users.id', '=', 'forumpost.users_id') - ->orderBy('forumpost.created_at', 'desc'); + ->orderByDesc('forumpost.created_at'); if ($start !== false) { $range->limit($num)->offset($start); } diff --git a/app/Models/Release.php b/app/Models/Release.php index e93228da5..3262bc032 100644 --- a/app/Models/Release.php +++ b/app/Models/Release.php @@ -387,7 +387,7 @@ class Release extends Model ->selectRaw('SUM(grabs) as grabs') ->groupBy('id', 'searchname', 'adddate') ->havingRaw('SUM(grabs) > 0') - ->orderBy('grabs', 'desc') + ->orderByDesc('grabs') ->limit(10) ->get(); @@ -412,7 +412,7 @@ class Release extends Model ->selectRaw('SUM(comments) AS comments') ->groupBy('id', 'searchname', 'adddate') ->havingRaw('SUM(comments) > 0') - ->orderBy('comments', 'desc') + ->orderByDesc('comments') ->limit(10) ->get(); @@ -548,7 +548,7 @@ class Release extends Model ->rightJoin('dnzb_failures', 'dnzb_failures.release_id', '=', 'releases.id') ->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id') ->leftJoin('root_categories as cp', 'cp.id', '=', 'c.root_categories_id') - ->orderBy('postdate', 'desc'); + ->orderByDesc('postdate'); return $failedList->paginate(config('nntmux.items_per_page')); } @@ -578,7 +578,7 @@ class Release extends Model return false; } - return self::query()->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id')->whereIn('releases.id', $searchResult)->where('df.release_id', '=', null)->where('releases.categories_id', $rel['categories_id'])->where('id', '<>', $rel['id'])->orderBy('releases.postdate', 'desc')->first(['guid']); + return self::query()->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id')->whereIn('releases.id', $searchResult)->where('df.release_id', '=', null)->where('releases.categories_id', $rel['categories_id'])->where('id', '<>', $rel['id'])->orderByDesc('releases.postdate')->first(['guid']); } return false; diff --git a/app/Models/ReleaseComment.php b/app/Models/ReleaseComment.php index 0693412fe..055168152 100644 --- a/app/Models/ReleaseComment.php +++ b/app/Models/ReleaseComment.php @@ -97,7 +97,7 @@ class ReleaseComment extends Model */ public static function getComments($id) { - return self::query()->where('releases_id', $id)->orderBy('created_at', 'desc')->get()->toArray(); + return self::query()->where('releases_id', $id)->orderByDesc('created_at')->get()->toArray(); } public static function getCommentCount(): int @@ -162,7 +162,7 @@ class ReleaseComment extends Model $range = self::query() ->select(['release_comments.*', 'releases.guid']) ->leftJoin('releases', 'releases.id', '=', 'release_comments.releases_id') - ->orderBy('release_comments.created_at', 'desc'); + ->orderByDesc('release_comments.created_at'); return $range->paginate(config('nntmux.items_per_page')); } @@ -196,7 +196,7 @@ class ReleaseComment extends Model ->join('releases as r', 'r.id', '=', 'release_comments.releases_id') ->leftJoin('users as u', 'u.id', '=', 'release_comments.users_id') ->where('users_id', $uid) - ->orderBy('created_at', 'desc') + ->orderByDesc('created_at') ->paginate(config('nntmux.items_per_page')); } } diff --git a/app/Models/UsenetGroup.php b/app/Models/UsenetGroup.php index 6fc6216c8..04e3c67df 100644 --- a/app/Models/UsenetGroup.php +++ b/app/Models/UsenetGroup.php @@ -149,7 +149,7 @@ class UsenetGroup extends Model return self::query()->where('backfill', '=', 1)->where('last_record', '<>', 0)->orderBy('name')->get(); break; case 'date': - return self::query()->where('backfill', '=', 1)->where('last_record', '<>', 0)->orderBy('first_record_postdate', 'DESC')->get(); + return self::query()->where('backfill', '=', 1)->where('last_record', '<>', 0)->orderByDesc('first_record_postdate')->get(); break; default: return []; diff --git a/app/Models/User.php b/app/Models/User.php index 3cf48087f..19f3daef2 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -717,7 +717,7 @@ class User extends Authenticatable */ public static function getTopGrabbers() { - return self::query()->selectRaw('id, username, SUM(grabs) as grabs')->groupBy('id', 'username')->having('grabs', '>', 0)->orderBy('grabs', 'desc')->limit(10)->get(); + return self::query()->selectRaw('id, username, SUM(grabs) as grabs')->groupBy('id', 'username')->having('grabs', '>', 0)->orderByDesc('grabs')->limit(10)->get(); } /** @@ -725,7 +725,7 @@ class User extends Authenticatable */ public static function getUsersByMonth() { - return self::query()->whereNotNull('created_at')->where('created_at', '<>', '0000-00-00 00:00:00')->selectRaw("DATE_FORMAT(created_at, '%M %Y') as mth, COUNT(id) as num")->groupBy(['mth'])->orderBy('created_at', 'desc')->get(); + return self::query()->whereNotNull('created_at')->where('created_at', '<>', '0000-00-00 00:00:00')->selectRaw("DATE_FORMAT(created_at, '%M %Y') as mth, COUNT(id) as num")->groupBy(['mth'])->orderByDesc('created_at')->get(); } /** diff --git a/app/Models/UserDownload.php b/app/Models/UserDownload.php index 5d275620f..3a6330597 100644 --- a/app/Models/UserDownload.php +++ b/app/Models/UserDownload.php @@ -81,7 +81,7 @@ class UserDownload extends Model */ public static function getDownloadRequestsForUser($userID) { - return self::whereUsersId($userID)->with('release')->orderBy('timestamp', 'DESC')->get(); + return self::whereUsersId($userID)->with('release')->orderByDesc('timestamp')->get(); } /**