Adjust queries in classes related to browsing

Blacklight/Console.php

@@ -180,17 +180,18 @@ class Console
                     'rn.releases_id as nfoid',
                 ]
             )
-            ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id')
-            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id')
-            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id')
-            ->join('consoleinfo as con', 'con.id', '=', 'releases.consoleinfo_id')
+            ->from('releases as r')
+            ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id')
+            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id')
+            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id')
+            ->join('consoleinfo as con', 'con.id', '=', 'r.consoleinfo_id')
             ->join('genres as gn', 'con.genres_id', '=', 'gn.id')
-            ->where('releases.nzbstatus', '=', 1)
+            ->where('r.nzbstatus', '=', 1)
             ->where('con.title', '!=', '')
             ->where('con.cover', '=', 1);
         Releases::showPasswords($sql, true);
         if (\count($excludedcats) > 0) {
-            $sql->whereNotIn('releases.categories_id', $excludedcats);
+            $sql->whereNotIn('r.categories_id', $excludedcats);
         }
 
         if (\count($cat) > 0 && $cat[0] !== -1) {
@@ -198,7 +199,7 @@ class Console
         }
 
         $sql->groupBy('con.id')
-            ->orderBy('releases.postdate', 'desc');
+            ->orderBy('r.postdate', 'desc');
 
         $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats)));
         if ($return !== null) {

Blacklight/Games.php

@@ -249,17 +249,18 @@ class Games
                     'rn.releases_id as nfoid',
                 ]
             )
-            ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id')
-            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id')
-            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id')
-            ->join('gamesinfo as gi', 'gi.id', '=', 'releases.gamesinfo_id')
+            ->from('releases as r')
+            ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id')
+            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id')
+            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id')
+            ->join('gamesinfo as gi', 'gi.id', '=', 'r.gamesinfo_id')
             ->join('genres as gn', 'gi.genres_id', '=', 'gn.id')
-            ->where('releases.nzbstatus', '=', 1)
+            ->where('r.nzbstatus', '=', 1)
             ->where('gi.title', '!=', '')
             ->where('gi.cover', '=', 1);
         Releases::showPasswords($sql, true);
         if (\count($excludedcats) > 0) {
-            $sql->whereNotIn('releases.categories_id', $excludedcats);
+            $sql->whereNotIn('r.categories_id', $excludedcats);
         }
 
         if (\count($cat) > 0 && $cat[0] !== -1) {
@@ -267,7 +268,7 @@ class Games
         }
 
         $sql->groupBy('gi.id')
-            ->orderBy('releases.postdate', 'desc');
+            ->orderBy('r.postdate', 'desc');
 
         $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats)));
         if ($return !== null) {

Blacklight/Movie.php

@@ -245,23 +245,24 @@ class Movie
             ->select(
                 [
                     'm.*',
-                    'releases.movieinfo_id',
+                    'r.movieinfo_id',
                     'g.name as group_name',
                     'rn.releases_id as nfoid',
                 ]
             )
-            ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id')
-            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id')
-            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id')
-            ->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id')
+            ->from('releases as r')
+            ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id')
+            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id')
+            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id')
+            ->leftJoin('categories as c', 'c.id', '=', 'r.categories_id')
             ->leftJoin('categories as cp', 'cp.id', '=', 'c.parentid')
-            ->join('movieinfo as m', 'm.imdbid', '=', 'releases.imdbid')
-            ->where('releases.nzbstatus', '=', 1)
+            ->join('movieinfo as m', 'm.imdbid', '=', 'r.imdbid')
+            ->where('r.nzbstatus', '=', 1)
             ->where('m.title', '!=', '')
             ->where('m.imdbid', '!=', '0000000');
         Releases::showPasswords($sql, true);
         if (\count($excludedcats) > 0) {
-            $sql->whereNotIn('releases.categories_id', $excludedcats);
+            $sql->whereNotIn('r.categories_id', $excludedcats);
         }
 
         if (\count($cat) > 0 && $cat[0] !== -1) {
@@ -269,7 +270,7 @@ class Movie
         }
 
         $sql->groupBy('m.imdbid')
-            ->orderBy('releases.postdate', 'desc');
+            ->orderBy('r.postdate', 'desc');
 
         $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats)));
         if ($return !== null) {

Blacklight/Music.php

@@ -170,17 +170,18 @@ class Music
                     'rn.releases_id as nfoid',
                 ]
             )
-            ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id')
-            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id')
-            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id')
-            ->join('musicinfo as m', 'm.id', '=', 'releases.musicinfo_id')
+            ->from('releases as r')
+            ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id')
+            ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id')
+            ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id')
+            ->join('musicinfo as m', 'm.id', '=', 'r.musicinfo_id')
             ->join('genres as gn', 'm.genres_id', '=', 'gn.id')
-            ->where('releases.nzbstatus', '=', 1)
+            ->where('r.nzbstatus', '=', 1)
             ->where('m.title', '!=', '')
             ->where('m.cover', '=', 1);
         Releases::showPasswords($sql, true);
         if (\count($excludedcats) > 0) {
-            $sql->whereNotIn('releases.categories_id', $excludedcats);
+            $sql->whereNotIn('r.categories_id', $excludedcats);
         }
 
         if (\count($cat) > 0 && $cat[0] !== -1) {
@@ -188,7 +189,7 @@ class Music
         }
 
         $sql->groupBy('m.id')
-            ->orderBy('releases.postdate', 'desc');
+            ->orderBy('r.postdate', 'desc');
 
         $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats)));
         if ($return !== null) {

Changelog

@@ -1,4 +1,5 @@
 2018-04-13 DariusIII
+	* Chg: Adjust queries in classes related to browsing
 	* Chg: Update redirect on new rss key generation
 	* Chg: Add option to edit profile to ProfileController
 	* Chg: Add MyShowsController, adjust rest of the controllers and classes

app/Models/Category.php

@@ -234,7 +234,7 @@ class Category extends Model
                 if ($builder === false) {
                     $catsrch = $categories[0] !== -1 ? '  AND releases.categories_id = '.$categories[0] : '';
                 } else {
-                    $catsrch = $query->where('releases.categories_id', '=', $categories[0]);
+                    $catsrch = $query->where('r.categories_id', '=', $categories[0]);
                 }
                 break;
             // Multiple category constraints
@@ -242,7 +242,7 @@ class Category extends Model
                 if ($builder === false) {
                     $catsrch = ' AND releases.categories_id IN ('.implode(', ', $categories).') ';
                 } else {
-                    $catsrch = $query->whereIn('releases.categories_id', $categories);
+                    $catsrch = $query->whereIn('r.categories_id', $categories);
                 }
                 break;
         }