Update RSS class queries, use Model to retrieve results

This commit is contained in:
DariusIII
2018-11-07 10:00:36 +01:00
parent acdd5bd724
commit f0f1bd9679
2 changed files with 9 additions and 5 deletions
+8 -5
View File
@@ -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;
+1
View File
@@ -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