From 1c3ddb5c502b11d83b00a457dd28339ef8a6ccc0 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 26 Jul 2018 09:48:14 +0200 Subject: [PATCH] Update releases date handling in RSS and API operations --- Blacklight/http/API.php | 3 +-- Blacklight/http/Capabilities.php | 3 +++ Blacklight/http/XML_Response.php | 3 ++- Changelog | 1 + app/Transformers/ApiTransformer.php | 12 ++++++------ app/Transformers/DetailsTransformer.php | 12 ++++++------ 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Blacklight/http/API.php b/Blacklight/http/API.php index 7598c78e0..ab5c22a4d 100755 --- a/Blacklight/http/API.php +++ b/Blacklight/http/API.php @@ -178,8 +178,7 @@ class API extends Capabilities if ($releases && \count($releases)) { foreach ($releases as $key => $release) { if (isset($release->id)) { - $coverURL = $getCoverURL($release); - $releases[$key]->coverurl = $coverURL; + $releases[$key]->coverurl = $getCoverURL($release); } } } diff --git a/Blacklight/http/Capabilities.php b/Blacklight/http/Capabilities.php index ff13c001c..91f3ab693 100755 --- a/Blacklight/http/Capabilities.php +++ b/Blacklight/http/Capabilities.php @@ -32,6 +32,9 @@ use Illuminate\Support\Facades\DB; */ abstract class Capabilities { + /** + * @var \PDO + */ public $pdo; /** diff --git a/Blacklight/http/XML_Response.php b/Blacklight/http/XML_Response.php index eca060e6e..0f21ac0e8 100755 --- a/Blacklight/http/XML_Response.php +++ b/Blacklight/http/XML_Response.php @@ -22,6 +22,7 @@ namespace Blacklight\http; use App\Models\Category; +use Illuminate\Support\Carbon; /** * Class XMLReturn. @@ -440,7 +441,7 @@ class XML_Response $this->writeZedAttr('grabs', $this->release->grabs); $this->writeZedAttr('comments', $this->release->comments); $this->writeZedAttr('password', $this->release->passwordstatus); - $this->writeZedAttr('usenetdate', date_format(date_create($this->release->postdate), 'D, d M Y H:i:s O')); + $this->writeZedAttr('usenetdate', Carbon::parse($this->release->postdate)->toRssString()); if (! empty($this->release->group_name)) { $this->writeZedAttr('group', $this->release->group_name); } diff --git a/Changelog b/Changelog index 56e4d083b..ae7fd29f1 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-07-26 DariusIII + * Chg: Update releases date handling in RSS and API operations * Chg: Update tinymce to version 4.8.1 2018-07-25 DariusIII * Chg: Remove unused functions from Settings and Utility classes diff --git a/app/Transformers/ApiTransformer.php b/app/Transformers/ApiTransformer.php index 2aaa19a2f..00e2d2fbd 100644 --- a/app/Transformers/ApiTransformer.php +++ b/app/Transformers/ApiTransformer.php @@ -34,7 +34,7 @@ class ApiTransformer extends TransformerAbstract 'url' => url('/').'/getnzb?id='.$releases->guid.'.nzb'.'&i='.$this->user->id.'&r='.$this->user->api_token, 'category' => $releases->categories_id, 'category_name' => $releases->category_name, - 'added' => Carbon::parse($releases->adddate)->format('D, d M Y H:i:s O'), + 'added' => Carbon::parse($releases->adddate)->toRssString(), 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, @@ -44,7 +44,7 @@ class ApiTransformer extends TransformerAbstract 'grabs' => $releases->grabs !== 0 ? $releases->grabs : $this->null(), 'comments' => $releases->comments !== 0 ? $releases->comments : $this->null(), 'password' => $releases->passwordstatus, - 'usenetdate' => Carbon::parse($releases->postdate)->format('D, d M Y H:i:s O'), + 'usenetdate' => Carbon::parse($releases->postdate)->toRssString(), 'group' => $releases->group_name, ]; } @@ -56,7 +56,7 @@ class ApiTransformer extends TransformerAbstract 'url' => url('/').'/getnzb?id='.$releases->guid.'.nzb'.'&i='.$this->user->id.'&r='.$this->user->api_token, 'category' => $releases->categories_id, 'category_name' => $releases->category_name, - 'added' => Carbon::parse($releases->adddate)->format('D, d M Y H:i:s O'), + 'added' => Carbon::parse($releases->adddate)->toRssString(), 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, @@ -73,7 +73,7 @@ class ApiTransformer extends TransformerAbstract 'grabs' => $releases->grabs !== 0 ? $releases->grabs : $this->null(), 'comments' => $releases->comments !== 0 ? $releases->comments : $this->null(), 'password' => $releases->passwordstatus, - 'usenetdate' => Carbon::parse($releases->postdate)->format('D, d M Y H:i:s O'), + 'usenetdate' => Carbon::parse($releases->postdate)->toRssString(), 'group' => $releases->group_name, ]; } @@ -84,14 +84,14 @@ class ApiTransformer extends TransformerAbstract 'url' => url('/').'/getnzb?id='.$releases->guid.'.nzb'.'&i='.$this->user->id.'&r='.$this->user->api_token, 'category' => $releases->categories_id, 'category_name' => $releases->category_name, - 'added' => Carbon::parse($releases->adddate)->format('D, d M Y H:i:s O'), + 'added' => Carbon::parse($releases->adddate)->toRssString(), 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, 'grabs' => $releases->grabs !== 0 ? $releases->grabs : $this->null(), 'comments' => $releases->comments !== 0 ? $releases->comments : $this->null(), 'password' => $releases->passwordstatus, - 'usenetdate' => Carbon::parse($releases->postdate)->format('D, d M Y H:i:s O'), + 'usenetdate' => Carbon::parse($releases->postdate)->toRssString(), 'group' => $releases->group_name, ]; } diff --git a/app/Transformers/DetailsTransformer.php b/app/Transformers/DetailsTransformer.php index c6d35e475..f68f2a075 100644 --- a/app/Transformers/DetailsTransformer.php +++ b/app/Transformers/DetailsTransformer.php @@ -37,7 +37,7 @@ class DetailsTransformer extends TransformerAbstract 'url' => url('/').'/getnzb?id='.$releases->guid.'.nzb'.'&i='.$this->user->id.'&r='.$this->user->api_token, 'category' => $releases->categories_id, 'category_name' => $releases->category_name, - 'added' => Carbon::parse($releases->adddate)->format('D, d M Y H:i:s O'), + 'added' => Carbon::parse($releases->adddate)->toRssString(), 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, @@ -45,7 +45,7 @@ class DetailsTransformer extends TransformerAbstract 'grabs' => $releases->grabs, 'comments' => $releases->comments, 'password' => $releases->passwordstatus, - 'usenetdate' => Carbon::parse($releases->postdate)->format('D, d M Y H:i:s O'), + 'usenetdate' => Carbon::parse($releases->postdate)->toRssString(), 'group' => $releases->group_name, ]; } @@ -57,7 +57,7 @@ class DetailsTransformer extends TransformerAbstract 'link' => url('/').'/getnzb?id='.$releases->guid.'.nzb'.'&i='.$this->user->id.'&r='.$this->user->api_token, 'category' => $releases->categories_id, 'category_name' => $releases->category_name, - 'added' => Carbon::parse($releases->adddate)->format('D, d M Y H:i:s O'), + 'added' => Carbon::parse($releases->adddate)->toRssString(), 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, @@ -71,7 +71,7 @@ class DetailsTransformer extends TransformerAbstract 'grabs' => $releases->grabs, 'comments' => $releases->comments, 'password' => $releases->passwordstatus, - 'usenetdate' => Carbon::parse($releases->postdate)->format('D, d M Y H:i:s O'), + 'usenetdate' => Carbon::parse($releases->postdate)->toRssString(), 'group' => $releases->group_name, ]; } @@ -82,14 +82,14 @@ class DetailsTransformer extends TransformerAbstract 'link' => url('/').'/getnzb?id='.$releases->guid.'.nzb'.'&i='.$this->user->id.'&r='.$this->user->api_token, 'category' => $releases->categories_id, 'category_name' => $releases->category_name, - 'added' => Carbon::parse($releases->adddate)->format('D, d M Y H:i:s O'), + 'added' => Carbon::parse($releases->adddate)->toRssString(), 'size' => $releases->size, 'files' => $releases->totalpart, 'poster' => $releases->fromname, 'grabs' => $releases->grabs, 'comments' => $releases->comments, 'password' => $releases->passwordstatus, - 'usenetdate' => Carbon::parse($releases->postdate)->format('D, d M Y H:i:s O'), + 'usenetdate' => Carbon::parse($releases->postdate)->toRssString(), 'group' => $releases->group_name, ]; }