From ea61bfbaa9d977ec160cc41cea3223b5baf7856a Mon Sep 17 00:00:00 2001
From: KGT1 <kilian.gamn@gmx.de>
Date: Mon, 26 Oct 2020 10:17:50 +0100
Subject: [PATCH] fix not sending track stop on next or previous track

---
 src/playbackmanager.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/playbackmanager.js b/src/playbackmanager.js
index 88fc29b..b04761e 100644
--- a/src/playbackmanager.js
+++ b/src/playbackmanager.js
@@ -114,6 +114,14 @@ function seek (toSeek = 0) {
 		throw Error("No Song Playing");
 	}
 }
+
+function currentTrackStopped (itemId) {
+	jellyfinClientManager.getJellyfinClient().reportPlaybackStopped({
+		userId: jellyfinClientManager.getJellyfinClient().getCurrentUserId(),
+		itemId: itemId,
+		playSessionId: getPlaySessionId()
+	});
+}
 /**
  *
  * @param {Array} itemID - array of itemIDs to be added
@@ -123,12 +131,12 @@ function addTracks (itemID) {
 }
 
 function nextTrack () {
-	// console.log(currentPlayingPlaylistIndex + 1, currentPlayingPlaylist.length);
 	if (!(currentPlayingPlaylist)) {
 		throw Error("There is currently nothing playing");
 	} else if (currentPlayingPlaylistIndex + 1 >= currentPlayingPlaylist.length) {
 		throw Error("This is the Last song");
 	}
+	currentTrackStopped(getItemId());
 	startPlaying(undefined, undefined, currentPlayingPlaylistIndex + 1, 0, _disconnectOnFinish);
 }
 
@@ -140,6 +148,7 @@ function previousTrack () {
 			startPlaying(undefined, undefined, currentPlayingPlaylistIndex, 0, _disconnectOnFinish);
 			throw Error("This is the First song");
 		}
+		currentTrackStopped(getItemId());
 		startPlaying(undefined, undefined, currentPlayingPlaylistIndex - 1, 0, _disconnectOnFinish);
 	}
 }
@@ -155,11 +164,7 @@ function stop (disconnectVoiceConnection, itemId = getItemId()) {
 	if (disconnectVoiceConnection) {
 		disconnectVoiceConnection.disconnect();
 	}
-	jellyfinClientManager.getJellyfinClient().reportPlaybackStopped({
-		userId: jellyfinClientManager.getJellyfinClient().getCurrentUserId(),
-		itemId: itemId,
-		playSessionId: getPlaySessionId()
-	});
+	currentTrackStopped(itemId);
 	if (getAudioDispatcher()) {
 		try {
 			getAudioDispatcher().destroy();