Skip to content

A self-hosted media server and file management system

feat: include download privacy settings in resources

aminnausin4f336eedb524
diff --git a/app/Http/Resources/CategoryResource.php b/app/Http/Resources/CategoryResource.php
index b2299fe5..e655e982 100755
--- a/app/Http/Resources/CategoryResource.php
+++ b/app/Http/Resources/CategoryResource.php
@@ -27,8 +27,10 @@ class CategoryResource extends JsonResource {
return $folder->series->total_size;
});
+ $authenticatedRequest = Auth::user() && Auth::id() === 1;
+
return [
- 'id' => (string) $this->id,
+ 'id' => $this->id,
'name' => $this->name,
'default_folder_id' => $this->default_folder_id,
'folders' => FolderResource::collection($folders),
@@ -37,7 +39,9 @@ class CategoryResource extends JsonResource {
'total_size' => $totalSize ?? 0,
'created_at' => $this->created_at,
'last_scan' => $this->last_scan,
- 'is_private' => Auth::user() && Auth::id() === 1 ? $this->is_private : false,
+ 'is_private' => $authenticatedRequest ? $this->is_private : false,
+ 'allow_downloads' => $authenticatedRequest ? $this->allow_downloads : false,
+ 'require_login_for_downloads' => $authenticatedRequest ? $this->require_login_for_downloads : true,
];
}
}
diff --git a/app/Http/Resources/SeriesResource.php b/app/Http/Resources/SeriesResource.php
index 24853052..4d0b5b83 100644
--- a/app/Http/Resources/SeriesResource.php
+++ b/app/Http/Resources/SeriesResource.php
@@ -31,6 +31,7 @@ class SeriesResource extends JsonResource {
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
'edited_at' => $this->edited_at,
+ 'allow_downloads' => $this->allow_downloads,
];
}
}
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 70077d6c..77b2ec3d 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -13,7 +13,7 @@ class Category extends Model {
public $timestamps = false;
- protected $fillable = ['name', 'default_folder_id', 'editor_id'];
+ protected $fillable = ['name', 'default_folder_id', 'editor_id', 'allow_downloads', 'require_login_for_downloads'];
protected $casts = [
'allow_downloads' => 'boolean',
diff --git a/app/Models/Series.php b/app/Models/Series.php
index 86f604c5..217eb797 100644
--- a/app/Models/Series.php
+++ b/app/Models/Series.php
@@ -59,6 +59,7 @@ class Series extends Model {
'file_count',
'thumbnail_url',
'edited_at',
+ 'allow_downloads',
];
protected $casts = [