From 1769d191d2d6ad5e23c57caf0f898e56df266367 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 5 Aug 2019 22:22:31 -0700 Subject: [PATCH] Correct behavior of date formatting --- app/Transformers/Daemon/FileObjectTransformer.php | 4 ++-- resources/scripts/components/server/files/FileObjectRow.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Transformers/Daemon/FileObjectTransformer.php b/app/Transformers/Daemon/FileObjectTransformer.php index 1a160c90f..acaba0c43 100644 --- a/app/Transformers/Daemon/FileObjectTransformer.php +++ b/app/Transformers/Daemon/FileObjectTransformer.php @@ -38,8 +38,8 @@ class FileObjectTransformer extends BaseDaemonTransformer 'is_symlink' => Arr::get($item, 'symlink', false), 'is_editable' => in_array(Arr::get($item, 'mime', ''), $this->editable), 'mimetype' => Arr::get($item, 'mime'), - 'created_at' => Carbon::parse(explode(' ', Arr::get($item, 'created', ''))[0] ?? '')->toIso8601String(), - 'modified_at' => Carbon::parse(explode(' ', Arr::get($item, 'modified', ''))[0] ?? '')->toIso8601String(), + 'created_at' => Carbon::parse(Arr::get($item, 'created', ''))->toIso8601String(), + 'modified_at' => Carbon::parse(Arr::get($item, 'modified', ''))->toIso8601String(), ]; } diff --git a/resources/scripts/components/server/files/FileObjectRow.tsx b/resources/scripts/components/server/files/FileObjectRow.tsx index e4b94a21e..3d2f4c891 100644 --- a/resources/scripts/components/server/files/FileObjectRow.tsx +++ b/resources/scripts/components/server/files/FileObjectRow.tsx @@ -62,7 +62,7 @@ export default ({ file }: { file: FileObject }) => { {Math.abs(differenceInHours(file.modifiedAt, new Date())) > 48 ? format(file.modifiedAt, 'MMM Do, YYYY h:mma') : - distanceInWordsToNow(file.modifiedAt, { includeSeconds: true }) + distanceInWordsToNow(file.modifiedAt, { addSuffix: true }) }