From f0f1bd96791c2a50da56a3a51ecc4f963fd4c083 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 7 Nov 2018 10:00:36 +0100 Subject: [PATCH] Update RSS class queries, use Model to retrieve results --- Blacklight/http/RSS.php | 13 ++++++++----- Changelog | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Blacklight/http/RSS.php b/Blacklight/http/RSS.php index 9a0111dfa..a798565a5 100755 --- a/Blacklight/http/RSS.php +++ b/Blacklight/http/RSS.php @@ -2,6 +2,9 @@ namespace Blacklight\http; +use App\Models\Release; +use App\Models\UserMovie; +use App\Models\UserSerie; use Blacklight\NZB; use App\Models\Category; use Blacklight\Releases; @@ -111,7 +114,7 @@ class RSS extends Capabilities return $result; } - $result = DB::select($sql); + $result = Release::fromQuery($sql); Cache::put(md5($sql), $result, $expiresAt); return $result; @@ -147,7 +150,7 @@ class RSS extends Capabilities ORDER BY postdate DESC %s", $this->releases->getConcatenatedCategoryIDs(), $this->releases->uSQL( - DB::select( + UserSerie::fromQuery( sprintf( ' SELECT videos_id, categories @@ -173,7 +176,7 @@ class RSS extends Capabilities return $result; } - $result = DB::select($sql); + $result = Release::fromQuery($sql); Cache::put(md5($sql), $result, $expiresAt); return $result; @@ -210,7 +213,7 @@ class RSS extends Capabilities ORDER BY postdate DESC %s", $this->releases->getConcatenatedCategoryIDs(), $this->releases->uSQL( - DB::select( + UserMovie::fromQuery( sprintf( ' SELECT imdbid, categories @@ -235,7 +238,7 @@ class RSS extends Capabilities return $result; } - $result = DB::select($sql); + $result = Release::fromQuery($sql); Cache::put(md5($sql), $result, $expiresAt); return $result; diff --git a/Changelog b/Changelog index ccfd88edf..8ebfe698f 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-11-07 DariusIII + * Chg: Update RSS class queries, use Model to retrieve results * Fix: Fix error with tv episode data retrieval on API and RSS * Chg: Update Capabilities class output function PHPDOC block * Chg: Update spatie/laravel-permission to version 2.24.0