Skip to content

A self-hosted media server and file management system

chore: code smells

aminnausin38ba9bc3c834
diff --git a/app/Http/Resources/VideoResource.php b/app/Http/Resources/VideoResource.php
index 696ecf08..5f6f8f58 100755
--- a/app/Http/Resources/VideoResource.php
+++ b/app/Http/Resources/VideoResource.php
@@ -22,6 +22,10 @@ class VideoResource extends JsonResource {
$metadata = $this->metadata;
+ $folder = $this->relationLoaded('folder') ? $this->folder : null;
+ $series = $this->relationLoaded('folder.series') ? $this->folder->series : null;
+ $library = $this->relationLoaded('folder.category') ? $this->folder->category : null;
+
return [
'id' => $this->id,
'name' => $this->name,
@@ -55,11 +59,10 @@ class VideoResource extends JsonResource {
'metadata' => new MetadataResource($metadata),
'folder_id' => $this->folder_id,
- 'library_id' => $this->relationLoaded('folder') ? $this->folder->category_id : null,
+ 'library_id' => $folder?->category_id ?? null,
'url' => $this->relationLoaded('folder') ? "{$this->folder->category_id}/{$this->folder_id}?video={$this->id}" : null,
-
- 'folder_name' => $this->relationLoaded('folder.series') ? "{$this->folder->series->title}" : ($this->relationLoaded('folder') ? "{$this->folder->name}" : null),
- 'library_name' => $this->relationLoaded('folder.category') ? "{$this->folder->category->name}" : null,
+ 'folder_name' => $series?->title ?? $folder->name ?? null,
+ 'library_name' => $library?->name ?? null,
];
}
diff --git a/resources/js/components/home/HomeActivityFeed.vue b/resources/js/components/home/HomeActivityFeed.vue
index 3f853300..3375447c 100644
--- a/resources/js/components/home/HomeActivityFeed.vue
+++ b/resources/js/components/home/HomeActivityFeed.vue
@@ -28,7 +28,16 @@ const musicRef = computed(() => props.music);
const feed = useActivityFeed(videosRef, musicRef, foldersRef, 12);
const groups = computed(() => groupActivityFeed(feed.value));
-const typeIcon = (type: string) => (type === 'audio' ? ProiconsMusicNote2 : type === 'folder' ? IconFolder : CircumPlay1);
+const typeIcon = (type: string) => {
+ switch (type) {
+ case 'audio':
+ return ProiconsMusicNote2;
+ case 'folder':
+ return IconFolder;
+ default:
+ return CircumPlay1;
+ }
+};
</script>
<template>
diff --git a/resources/js/components/lazy/BlurhashImage.vue b/resources/js/components/lazy/BlurhashImage.vue
index a3b5e0ba..390d7982 100644
--- a/resources/js/components/lazy/BlurhashImage.vue
+++ b/resources/js/components/lazy/BlurhashImage.vue
@@ -129,7 +129,7 @@ onBeforeUnmount(() => {
</script>
<template>
<div ref="containerRef" :class="cn('relative block h-full w-full', wrapperClass)">
- <canvas v-if="blurhash" ref="canvasRef" v-show="!isError" :class="cn('absolute inset-0 z-0 h-full w-full object-cover', $attrs.class)" aria-hidden="true" />
+ <canvas v-if="blurhash" ref="canvasRef" v-show="!isError" :class="cn('absolute inset-0 z-0 h-full w-full object-cover', $attrs.class)" aria-hidden="true" tabindex="-1" />
<div v-else v-show="src && isLoading && !isError" class="absolute inset-0 flex items-center justify-center">
<SvgSpinners90RingWithBg class="size-4" />
</div>
diff --git a/resources/js/components/panels/HomeRightSidebar.vue b/resources/js/components/panels/HomeRightSidebar.vue
index c97bec5c..12fedb4c 100644
--- a/resources/js/components/panels/HomeRightSidebar.vue
+++ b/resources/js/components/panels/HomeRightSidebar.vue
@@ -1,8 +1,7 @@
<script setup lang="ts">
import { useRecentlyUpdated, useRecentlyUploaded } from '@/service/home/useHomeQueries';
-import { defineAsyncComponent } from 'vue';
+import { defineAsyncComponent, computed } from 'vue';
import { useAppStore } from '@/stores/AppStore';
-import { computed } from 'vue';
import SidebarSkeleton from '@/components/skeleton/composites/SidebarSkeleton.vue';
diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vue
index c612fd19..c595c5d3 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -138,11 +138,12 @@ watch(isDesktop, (now) => {
<button
id="user-header"
class="hover:text-primary dark:hover:text-primary-muted flex h-8 cursor-pointer items-center justify-center gap-2 rounded-md text-2xl capitalize"
- @click="toggleDropdown"
+ title="Toggle navigation menu"
+ type="button"
aria-haspopup="menu"
- :aria-expanded="showDropdown ? 'true' : 'false'"
aria-controls="user-dropdown"
- title="Toggle navigation menu"
+ :aria-expanded="showDropdown ? 'true' : 'false'"
+ @click="toggleDropdown"
>
<h2 id="user-name" class="hidden truncate sm:block" :class="[{ 'suspense-rounded bg-surface-2 h-5 w-32': isLoadingUserData }]">
{{ isLoadingUserData ? '' : userData?.name || 'Guest' }}
diff --git a/resources/js/service/home/homeAPI.ts b/resources/js/service/home/homeAPI.ts
index 16d7b1fa..07dd37b1 100644
--- a/resources/js/service/home/homeAPI.ts
+++ b/resources/js/service/home/homeAPI.ts
@@ -23,6 +23,8 @@ export const getRecentlyAdded = async (): Promise<FolderResource[]> => {
};
export const getRecentlyUploaded = async (mediaType?: 'video' | 'audio'): Promise<VideoResource[]> => {
- const { data } = await API.get(`/explore/recently-uploaded${mediaType ? `?type=${mediaType}` : ''}`);
+ const { data } = await API.get(`/explore/recently-uploaded`, {
+ params: mediaType ? { type: mediaType } : undefined,
+ });
return data.data;
};
diff --git a/resources/js/service/home/useActivityFeed.ts b/resources/js/service/home/useActivityFeed.ts
index 1744ab64..089a25c2 100644
--- a/resources/js/service/home/useActivityFeed.ts
+++ b/resources/js/service/home/useActivityFeed.ts
@@ -73,7 +73,9 @@ export const useActivityFeed = (
(item) => item.timestamp,
);
- return items.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime()).slice(0, limit);
+ items.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
+
+ return items.slice(0, limit);
});
export const groupLabel = (timestamp: string): string => {
@@ -98,7 +100,7 @@ export const groupActivityFeed = (items: ActivityItem[]): { label: string; items
for (const item of items) {
const label = groupLabel(item.timestamp);
- const last = groups[groups.length - 1];
+ const last = groups.at(-1);
if (last?.label === label) last.items.push(item);
else groups.push({ label, items: [item] });
}
diff --git a/resources/js/service/queries.ts b/resources/js/service/queries.ts
index 98c228d3..a7fc6643 100644
--- a/resources/js/service/queries.ts
+++ b/resources/js/service/queries.ts
@@ -5,13 +5,12 @@ import type { Session } from '@/types/model';
import type { Ref } from 'vue';
import { getSiteAnalytics, getPulse, getUsers, getTasks, getTaskStats, getActiveSessions, getManifest, getTaskWaitTimes } from '@/service/siteAPI.ts';
-import { getCategories, getFolders } from '@/service/mediaAPI.ts';
import { getSessions } from '@/service/authAPI';
import { useQuery } from '@tanstack/vue-query';
import { computed } from 'vue';
import { useAuth } from '@/composables/auth/useAuth';
-import mediaAPI from '@/service/mediaAPI.ts';
+import mediaAPI, { getCategories, getFolders } from '@/service/mediaAPI.ts';
export const useGetAllTags = () => {
return useQuery({