Skip to content

A self-hosted media server and file management system

feat: new visibilty scope on category

aminnausin671d02f29c12
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index c394168c..27219389 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -88,7 +88,7 @@ class DirectoryController extends Controller {
}
private function validateCategoryAccess(Category $category): void {
- if ($category->is_private && Auth::id() !== 1) {
+ if (! $category->isVisibleTo(Auth::user())) {
throw new ForbiddenLibraryException('Access to this folder is forbidden');
}
}
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 1afbfa32..f1a38cd5 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -53,4 +54,12 @@ class Category extends Model {
public function storyboardEnabled(): bool {
return $this->storyboard_enabled;
}
+
+ public function isVisibleTo(?User $user): bool {
+ return ! $this->is_private || (bool) $user?->isAdmin();
+ }
+
+ public function scopeVisibleTo(Builder $query, ?User $user): Builder {
+ return $user?->isAdmin() ? $query : $query->where('is_private', false);
+ }
}