Skip to content

A self-hosted media server and file management system

fix: was using date_action instead of action_at on series resource

aminnausin108211acd665
diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.php
index b23c62ca..db8cc4a2 100644
--- a/app/Http/Resources/SeriesResource.php
+++ b/app/Http/Resources/SeriesResource.php
@@ -9,6 +9,31 @@ class SeriesResource extends JsonResource {
/**
* Transform the resource into an array.
*
+ * id -> int8 (pk) (index)
+ * folder_id -> int8 (fk) (nullable) (index)
+ * editor_id -> int8 (fk) (nullable)
+ * composite_id -> varchar(255) (index)
+ *
+ * primary_media_type -> int2 (enum)
+ * total_size -> int8
+ *
+ * title -> varchar(255) (nullable)
+ * description -> text (nullable)
+ * studio -> varchar(255) (nullable)
+ * rating -> int2 (nullable)
+ * seasons -> int4 (nullable)
+ * episodes -> int4 (nullable)
+ * films -> int4 (nullable)
+ * thumbnail_url -> varchar(255) (nullable)
+ * raw_thumbnail_url -> varchar(255) (nullable)
+ *
+ * date_start -> date (nullable)
+ * date_end -> date (nullable)
+ *
+ * created_at -> timestamp (nullable)
+ * updated_at -> timestamp (nullable)
+ * edited_at -> timestamp (nullable)
+ *
* @return array<string, mixed>
*/
public function toArray(Request $request): array {
@@ -27,8 +52,11 @@ class SeriesResource extends JsonResource {
'date_start' => $this->date_start,
'date_end' => $this->date_end,
'thumbnail_url' => $this->thumbnail_url,
- 'date_updated' => $this->updated_at,
- 'date_created' => $this->created_at,
+ // 'date_updated' => $this->updated_at,
+ // 'date_created' => $this->created_at,
+ 'created_at' => $this->created_at,
+ 'updated_at' => $this->updated_at,
+ 'edited_at' => $this->edited_at,
];
}
}
diff --git a/app/Services/PreviewGeneratorService.php b/app/Services/PreviewGeneratorService.php
index 2b8adfa3..81881c90 100644
--- a/app/Services/PreviewGeneratorService.php
+++ b/app/Services/PreviewGeneratorService.php
@@ -105,14 +105,14 @@ class PreviewGeneratorService {
'is_audio' => $isAudio,
'file_count' => $folderResource->file_count,
'thumbnail_url' => $thumbnail,
- 'upload_date' => $this->formatDate($folderResource->series->date_created),
+ 'upload_date' => $this->formatDate($folderResource->series->created_at),
'content_string' => $contentString,
'rating' => $folderResource->series->rating,
'tags' => $folderResource->series->folder_tags ? array_map(fn ($tag) => $tag->name, $folderResource->series->folder_tags) : null,
'url' => $request->fullUrl(),
];
- return $this->preparePreviewData($data, "folders/{$folder->id}", strtotime($folderResource->series?->date_updated ?? ''));
+ return $this->preparePreviewData($data, "folders/{$folder->id}", strtotime($folderResource->series?->updated_at ?? ''));
}
protected function buildVideoPreviewData(Category $category, ?Folder $folder, string $videoId, Request $request): array {
@@ -126,7 +126,7 @@ class PreviewGeneratorService {
$releaseDate = $this->formatDate($video->metadata->date_released ?: $video->metadata->date_uploaded);
$contentString = $releaseDate . ' • ' . $this->formatDuration($videoResource?->metadata?->duration ?? null);
- $folderDateUpdated = strtotime($folderResource->series->date_updated);
+ $folderDateUpdated = strtotime($folderResource->series->updated_at);
$videoDateUpdated = strtotime($videoResource->date_updated ?? '') ?: 0;
$latestTimestamp = max($folderDateUpdated, $videoDateUpdated);
$data = [
diff --git a/resources/js/contracts/media.ts b/resources/js/contracts/media.ts
index 0653eebd..422e5357 100644
--- a/resources/js/contracts/media.ts
+++ b/resources/js/contracts/media.ts
@@ -13,6 +13,8 @@ export interface CategoryResource {
last_scan: number;
is_private?: boolean;
}
+
+//#region Folders
export interface FolderResource {
id: number;
name: string;
@@ -30,6 +32,30 @@ export interface FolderResource {
edited_at?: string;
last_scan: number;
}
+
+export interface SeriesResource {
+ id: number;
+ folder_id?: number;
+ editor_id?: number;
+ title?: string;
+ description?: string;
+ studio?: string;
+ rating?: number;
+ seasons?: number;
+ episodes?: number;
+ films?: number;
+ thumbnail_url?: string;
+ folder_tags?: FolderTagResource[];
+ created_at?: string;
+ updated_at?: string;
+ edited_at?: string;
+ date_start?: string;
+ date_end?: string;
+}
+
+//#endregion
+
+//#region Media
export interface MetadataResource {
id: number;
attributes: {
@@ -85,22 +111,4 @@ export interface SubtitleResource {
is_forced: boolean;
}
-export interface SeriesResource {
- id: number;
- folder_id?: number;
- editor_id?: number;
- title?: string;
- description?: string;
- studio?: string;
- rating?: number;
- seasons?: number;
- episodes?: number;
- films?: number;
- thumbnail_url?: string;
- folder_tags?: FolderTagResource[];
- created_at?: string;
- updated_at?: string;
- edited_at?: string;
- date_start?: string;
- date_end?: string;
-}
+//#endregion