diff --git a/Changelog b/Changelog index 1d4108300..934b74d9c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-12-26 DariusIII + * Fix: Fix used groupBy query builder function syntax * Chg: Change order of query parts in processNfoFiles function * Chg: Use collection count method to get query rows count * Chg: Remove unused use statement for Users class diff --git a/app/Models/User.php b/app/Models/User.php index 99d81d03b..94bcfdbf7 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -390,7 +390,7 @@ class User extends Authenticatable $order = getUserBrowseOrder($orderBy); - $users = self::query()->with('role', 'request')->where('id', '!=', 0)->groupBy(['id'])->orderBy($order[0], $order[1])->withCount('request as apirequests'); + $users = self::query()->with('role', 'request')->where('id', '!=', 0)->groupBy('id')->orderBy($order[0], $order[1])->withCount('request as apirequests'); if ($userName !== '') { $users->where('username', 'LIKE', '%'.$userName.'%'); } @@ -865,7 +865,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)->orderBy('grabs', 'desc')->limit(10)->get(); } /** diff --git a/app/Models/UserRole.php b/app/Models/UserRole.php index 9d83d5a46..2e093edae 100644 --- a/app/Models/UserRole.php +++ b/app/Models/UserRole.php @@ -39,7 +39,7 @@ class UserRole extends Model */ public static function getUsersByRole() { - return self::query()->select(['name'])->withCount('users')->groupBy(['name'])->having('users_count', '>', 0)->orderBy('users_count', 'desc')->get(); + return self::query()->select(['name'])->withCount('users')->groupBy('name')->having('users_count', '>', 0)->orderBy('users_count', 'desc')->get(); } /** diff --git a/nntmux/Groups.php b/nntmux/Groups.php index e3ddaef89..755ff6dc8 100755 --- a/nntmux/Groups.php +++ b/nntmux/Groups.php @@ -211,7 +211,7 @@ class Groups */ public function getRange($offset = false, $limit = false, $groupname = '', $active = false) { - $groups = Group::query()->groupBy(['id'])->orderBy('name'); + $groups = Group::query()->groupBy('id')->orderBy('name'); if ($groupname !== '') { $groups->where('name', 'LIKE', '%'.$groupname.'%'); diff --git a/nntmux/Nfo.php b/nntmux/Nfo.php index f07c0e86a..b50b6b4f5 100755 --- a/nntmux/Nfo.php +++ b/nntmux/Nfo.php @@ -302,7 +302,7 @@ class Nfo $qry = Release::query() ->select(['nfostatus as status']) ->selectRaw('COUNT(id) as count') - ->groupBy(['nfostatus']) + ->groupBy('nfostatus') ->orderBy('nfostatus'); if ($guidChar !== '') { diff --git a/nntmux/Releases.php b/nntmux/Releases.php index 2eb2575e4..7a8248e17 100755 --- a/nntmux/Releases.php +++ b/nntmux/Releases.php @@ -1486,7 +1486,15 @@ class Releases return $releases; } - $releases = Release::query()->where('grabs', '>', 0)->select(['id', 'searchname', 'guid', 'adddate'])->selectRaw('SUM(grabs) as grabs')->groupBy(['id', 'searchname', 'adddate'])->havingRaw('SUM(grabs) > 0')->orderBy('grabs', 'desc')->limit(10)->get(); + $releases = Release::query() + ->where('grabs', '>', 0) + ->select(['id', 'searchname', 'guid', 'adddate']) + ->selectRaw('SUM(grabs) as grabs') + ->groupBy('id', 'searchname', 'adddate') + ->havingRaw('SUM(grabs) > 0') + ->orderBy('grabs', 'desc') + ->limit(10) + ->get(); $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); Cache::put('topdownloads', $releases, $expiresAt); @@ -1504,7 +1512,15 @@ class Releases return $comments; } - $comments = Release::query()->where('comments', '>', 0)->select(['id', 'guid', 'searchname'])->selectRaw('SUM(comments) AS comments')->groupBy(['id', 'searchname', 'adddate'])->havingRaw('SUM(comments) > 0')->orderBy('comments', 'desc')->limit(10)->get(); + $comments = Release::query() + ->where('comments', '>', 0) + ->select(['id', 'guid', 'searchname']) + ->selectRaw('SUM(comments) AS comments') + ->groupBy('id', 'searchname', 'adddate') + ->havingRaw('SUM(comments) > 0') + ->orderBy('comments', 'desc') + ->limit(10) + ->get(); $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); Cache::put('topcomments', $comments, $expiresAt); @@ -1527,7 +1543,7 @@ class Releases ->selectRaw('COUNT(r.id) as count') ->join('categories as cp', 'cp.id', '=', 'categories.parentid') ->join('releases as r', 'r.categories_id', '=', 'categories.id') - ->groupBy(['title']) + ->groupBy('title') ->orderBy('count', 'desc') ->get(); diff --git a/nntmux/libraries/Forking.php b/nntmux/libraries/Forking.php index ede8981ce..3b530c0b7 100755 --- a/nntmux/libraries/Forking.php +++ b/nntmux/libraries/Forking.php @@ -861,7 +861,7 @@ class Forking extends \fork_daemon $qry->where('size', '>', $this->minSize * 1048576); } - $this->work = $qry->groupBy(['leftguid'])->limit(16)->get()->toArray(); + $this->work = $qry->groupBy('leftguid')->limit(16)->get()->toArray(); $maxProcesses = (int) Settings::settingValue('..nfothreads'); }