mirror/App
1
0
Fork 0
mirror of https://github.com/Jellify-Music/App.git synced 2026-03-13 15:39:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix skipping when it's the last track in the queue

Browse Source
This commit is contained in:
Violet Caulfield
2025-02-24 23:00:54 -06:00
parent a9c7b7046d
commit 6f1a794b8a
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
player/provider.tsx
View File

@@ -12,7 +12,7 @@ import { useMutation, UseMutationResult } from "@tanstack/react-query";
import { mapDtoToTrack } from "../helpers/mappings";
import { QueuingType } from "../enums/queuing-type";
import { trigger } from "react-native-haptic-feedback";
import { getQueue, pause, seekTo, skip, skipToNext, skipToPrevious } from "react-native-track-player/lib/src/trackPlayer";
import { getActiveTrackIndex, getQueue, pause, seekTo, skip, skipToNext, skipToPrevious } from "react-native-track-player/lib/src/trackPlayer";
import { convertRunTimeTicksToSeconds } from "../helpers/runtimeticks";
import Client from "../api/client";
import { AddToQueueMutation, QueueMutation, QueueOrderMutation } from "./interfaces";
@@ -187,16 +187,23 @@ const PlayerContextInitializer = () => {
const useSkip = useMutation({
mutationFn: async (index?: number | undefined) => {
trigger("impactMedium")
if (!isUndefined(index)) {
setIsSkipping(true);
setNowPlaying(playQueue[index]);
await skip(index);
setIsSkipping(false);
}
// Handle if this is the last track in the queue
if (playQueue.length - 1 === await getActiveTrackIndex())
return;
else {
const nowPlayingIndex = playQueue.findIndex((track) => track.item.Id === nowPlaying!.item.Id);
setNowPlaying(playQueue[nowPlayingIndex + 1])
await skipToNext();
if (!isUndefined(index)) {
setIsSkipping(true);
setNowPlaying(playQueue[index]);
await skip(index);
setIsSkipping(false);
}
else {
const nowPlayingIndex = playQueue.findIndex((track) => track.item.Id === nowPlaying!.item.Id);
setNowPlaying(playQueue[nowPlayingIndex + 1])
await skipToNext();
}
}
}
});