A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
new data for users
aminnausin95d154b1053c
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.phpindex dcb46189..d1f4acbc 100755--- a/app/Http/Controllers/Api/V1/CategoryController.php+++ b/app/Http/Controllers/Api/V1/CategoryController.php@@ -17,14 +17,17 @@ class CategoryController extends Controller {* Display a listing of the resource.*/public function index() {- if (! Auth::user() || Auth::user()->id !== 1) {+ if (! Auth::user()) {abort(403, 'Unauthorized action.');}-try {+ $categories = Category::orderBy('name');+ if (Auth::user()->id !== 1) {+ $categories->where('is_private', false);+ }return $this->success(CategoryResource::collection(- Category::orderBy('name')->get()+ $categories->get()));} catch (\Throwable $th) {diff --git a/app/Http/Controllers/Api/V1/TasksController.php b/app/Http/Controllers/Api/V1/TasksController.phpindex 27654e00..9160b1b3 100644--- a/app/Http/Controllers/Api/V1/TasksController.php+++ b/app/Http/Controllers/Api/V1/TasksController.php@@ -21,7 +21,7 @@ class TasksController extends Controller {*/public function index() {if (! Auth::user() || Auth::user()->id !== 1) {- abort(403, 'Unauthorized action.');+ abort(403, 'Not allowed access to tasks.');}try {diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.phpindex 6f98d6ce..a0982380 100644--- a/app/Http/Controllers/Api/V1/UserController.php+++ b/app/Http/Controllers/Api/V1/UserController.php@@ -16,10 +16,16 @@ class UserController extends Controller {* Display a listing of the resource.*/public function index() {- if (! Auth::user() || Auth::user()->id !== 1) {+ if (! Auth::user()) {abort(403, 'Unauthorized action.');}+ if (Auth::user()->id !== 1) {+ return UserResource::collection(+ User::where('id', Auth::user()->id)->get()+ );+ }+try {returnUserResource::collection(@@ -45,7 +51,7 @@ class UserController extends Controller {}public function SessionCount() {- if (! Auth::user() || Auth::user()->id !== 1) {+ if (! Auth::user()) {abort(403, 'Unauthorized action.');}diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 6b6b57ea..702005cf 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -44,11 +44,13 @@ class DirectoryController extends Controller {$dir = trim(strtolower($request?->dir ?? ''));$folderName = trim(strtolower($request?->folderName ?? ''));- if (isset($privateCategories[$dir]) && (! $request->user('sanctum') || (Auth::user() && Auth::user()->id !== 1))) {++ $dirRaw = Category::select('id', 'default_folder_id')->firstWhere('name', 'ilike', '%' . $dir . '%');++ if ((isset($privateCategories[$dir]) || $dirRaw->is_private) && (! $request->user('sanctum') || (Auth::user() && Auth::user()->id !== 1))) {return $this->error(null, 'Access to this folder is forbidden', 403);}- $dirRaw = Category::select('id', 'default_folder_id')->firstWhere('name', 'ilike', '%' . $dir . '%');$data = ['dir' => ['id' => null, 'name' => $dir, 'folders' => null], 'folder' => ['id' => null, 'name' => $folderName ?? null, 'videos' => null]]; // Default null valuesif (! isset($dirRaw->id)) { // Cannot find category so return default nullsdiff --git a/database/migrations/2025_01_14_055203_add_private_key_to_categories.php b/database/migrations/2025_01_14_055203_add_private_key_to_categories.phpnew file mode 100644index 00000000..9dda1cd9--- /dev/null+++ b/database/migrations/2025_01_14_055203_add_private_key_to_categories.php@@ -0,0 +1,26 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\Schema;++return new class extends Migration {+ /**+ * Run the migrations.+ */+ public function up(): void {+ Schema::table('categories', function (Blueprint $table) {+ // Only user with id 1 can see if it is private+ $table->boolean('is_private')->default('false');+ });+ }++ /**+ * Reverse the migrations.+ */+ public function down(): void {+ Schema::table('categories', function (Blueprint $table) {+ $table->dropColumn('is_private');+ });+ }+};diff --git a/resources/js/components/dashboard/DashboardUsers.vue b/resources/js/components/dashboard/DashboardUsers.vueindex 6e76647f..af75ef2c 100644--- a/resources/js/components/dashboard/DashboardUsers.vue+++ b/resources/js/components/dashboard/DashboardUsers.vue@@ -99,7 +99,7 @@ const submitDelete = async () => {const loadData = async () => {const { data: rawActiveSessions } = await getActiveSessions();- activeSessions.value = parseInt(rawActiveSessions) ?? 0;+ activeSessions.value = !isNaN(parseInt(rawActiveSessions)) ? parseInt(rawActiveSessions) : 0;// const { data: rawUsers } = await getUsers();@@ -134,7 +134,7 @@ onMounted(() => {</div><div class="capitalize text-sm font-medium text-neutral-600 dark:text-neutral-300 flex flex-col gap-1 w-fit text-end"><p class="w-fit">Users: {{ stateUsers.length }}</p>- <p class="w-fit">Active: {{ activeSessions }}</p>+ <p class="w-fit">Active: {{ activeSessions ?? 0 }}</p></div></div><TableBasediff --git a/resources/js/views/DashboardView.vue b/resources/js/views/DashboardView.vueindex 65487468..1eaeaf3a 100644--- a/resources/js/views/DashboardView.vue+++ b/resources/js/views/DashboardView.vue@@ -57,7 +57,6 @@ const dashboardTabs = computed<description: '',info: { value: `Total Size: ${stateTotalLibrariesSize?.value ?? '?'}` },icon: ProiconsLibrary,- disabled: userData.value?.id !== 1,},// {// name: 'activity',@@ -70,7 +69,6 @@ const dashboardTabs = computed<description: '',info: { value: 'Logged In: ?' },icon: LucideUsers,- disabled: userData.value?.id !== 1,},{name: 'tasks',