Skip to content

A self-hosted media server and file management system

feat: recently added music

aminnausin15d58781915f
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index a3889ef5..b7b06dff 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use App\Enums\MediaType;
use App\Http\Resources\FolderResource;
use App\Http\Resources\VideoResource;
use App\Models\Category;
@@ -96,11 +97,39 @@ class HomeController extends Controller {
public function recentlyUploaded(Request $request) {
$libraryIds = Category::visibleTo($request->user())->pluck('id');
+ $typeParam = $request->query('type');
+
+ $mediaType = collect(MediaType::cases())->first(fn (MediaType $case) => $case->label() === strtolower((string) $typeParam));
+
+ $videos = Video::query()
+ ->with(['folder', 'metadata'])
+ ->whereHas('folder', function ($query) use ($libraryIds, $mediaType) {
+ $query->whereIn('category_id', $libraryIds);
+ if ($mediaType !== null) {
+ $query->whereHas('series', function ($seriesQuery) use ($mediaType) {
+ $seriesQuery->where('primary_media_type', $mediaType);
+ });
+ }
+ })
+ ->orderByDesc('created_at')
+ ->limit($this->defaultLimit)
+ ->get();
+
+ $videos = $videos->map(function (Video $video) {
+ return $this->eagerLoadVideo($video, $video->metadata);
+ });
+
+ return VideoResource::collection($videos);
+ }
+
+ public function recentlyUploadedMusic(Request $request) {
+ $libraryIds = Category::visibleTo($request->user())->pluck('id');
$videos = Video::query()
->with(['folder', 'metadata'])
->whereHas('folder', function ($query) use ($libraryIds) {
$query->whereIn('category_id', $libraryIds);
+ $query->where('primary_media_type', '=', MediaType::AUDIO);
})
->orderByDesc('created_at')
->limit($this->defaultLimit)
diff --git a/resources/js/service/home/homeAPI.ts b/resources/js/service/home/homeAPI.ts
index afa512a2..49e0ebc8 100644
--- a/resources/js/service/home/homeAPI.ts
+++ b/resources/js/service/home/homeAPI.ts
@@ -22,7 +22,7 @@ export const getRecentlyAdded = async (): Promise<FolderResource[]> => {
return data.data;
};
-export const getRecentlyUploaded = async (): Promise<VideoResource[]> => {
- const { data } = await API.get('/home/recently-uploaded');
+export const getRecentlyUploaded = async (mediaType?: 'video' | 'audio'): Promise<VideoResource[]> => {
+ const { data } = await API.get(`/home/recently-uploaded${mediaType ? `?type=${mediaType}` : ''}`);
return data.data;
};
diff --git a/resources/js/service/home/useHomeQueries.ts b/resources/js/service/home/useHomeQueries.ts
index ce54ef94..4605dc74 100644
--- a/resources/js/service/home/useHomeQueries.ts
+++ b/resources/js/service/home/useHomeQueries.ts
@@ -37,10 +37,10 @@ export const useRecentlyAdded = () => {
});
};
-export const useRecentlyUploaded = () => {
+export const useRecentlyUploaded = (mediaType?: 'video' | 'audio') => {
return useQuery({
- queryKey: ['home', 'recently-uploaded'],
- queryFn: getRecentlyUploaded,
+ queryKey: ['home', ['recently-uploaded', mediaType].filter(Boolean).join('-')],
+ queryFn: () => getRecentlyUploaded(mediaType),
staleTime: 1000 * 30,
retry: false,
});
diff --git a/resources/js/views/HomeView.vue b/resources/js/views/HomeView.vue
index b0f673fe..d84247ac 100644
--- a/resources/js/views/HomeView.vue
+++ b/resources/js/views/HomeView.vue
@@ -14,8 +14,9 @@ import HomeShelf from '@/components/home/HomeShelf.vue';
const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());
+const { data: recentlyUploadedMusic, isLoading: isLoadingRecentlyUploadedMusic } = useRecentlyUploaded('audio');
+const { data: recentlyUploaded, isLoading: isLoadingRecentlyUploaded } = useRecentlyUploaded('video');
const { data: continueWatching, isLoading: isLoadingContinueWatching } = useContinueWatching();
-const { data: recentlyUploaded, isLoading: isLoadingRecentlyUploaded } = useRecentlyUploaded();
const { data: recentlyReleased, isLoading: isLoadingRecentlyReleased } = useRecentlyReleased();
const { data: recentlyUpdated, isLoading: isLoadingRecentlyUpdated } = useRecentlyUpdated();
const { data: recentlyAdded, isLoading: isLoadingRecentlyAdded } = useRecentlyAdded();
@@ -33,21 +34,31 @@ onMounted(() => {
<HomeShelf
v-if="isLoadingContinueWatching || !!continueWatching?.length"
title="Continue Watching"
- skeleton-class="w-56 aspect-video"
+ skeleton-class="w-56 3xl:w-76 aspect-video"
:item-count="continueWatching?.length"
:is-loading="isLoadingContinueWatching"
>
- <RecentlyWatchedCard v-for="video in continueWatching" :key="video.id" :video="video" />
+ <RecentlyWatchedCard class="3xl:w-76" v-for="video in continueWatching" :key="video.id" :video="video" />
</HomeShelf>
<HomeShelf
v-if="isLoadingRecentlyUploaded || !!recentlyUploaded?.length"
- title="Recently Uploaded Media"
- skeleton-class="w-56 aspect-video"
+ title="Recently Uploaded Videos"
+ skeleton-class="w-56 3xl:w-76 aspect-video"
:item-count="recentlyUploaded?.length"
:is-loading="isLoadingRecentlyUploaded"
>
- <RecentlyUploadedCard v-for="video in recentlyUploaded" :key="video.id" :video="video" />
+ <RecentlyUploadedCard class="3xl:w-76" v-for="video in recentlyUploaded" :key="video.id" :video="video" />
+ </HomeShelf>
+
+ <HomeShelf
+ v-if="isLoadingRecentlyUploadedMusic || !!recentlyUploadedMusic?.length"
+ title="Recently Uploaded Music"
+ skeleton-class="w-40 aspect-square"
+ :item-count="recentlyUploadedMusic?.length"
+ :is-loading="isLoadingRecentlyUploadedMusic"
+ >
+ <RecentlyUploadedCard v-for="video in recentlyUploadedMusic" :key="video.id" :video="video" :force-audio="true" class="w-40" />
</HomeShelf>
<HomeShelf