skip random

api/helpers.go

@@ -14,7 +14,7 @@ func getNextSong() (Track, error) {
 	if voteToSkipEnabled {
 		nextTrack, err = getNextSongRandom()
 	} else {
-	nextTrack, err = getNextSongByVotes()
+		nextTrack, err = getNextSongByVotes()
 	}
 	if err != nil {
 		// Assume no record - get from fallback playlist
@@ -28,7 +28,11 @@ func getNextSong() (Track, error) {
 func getNextSongExcludeURI(excludeUri spotify.URI) (Track, error) {
 	var nextTrack Track
 	var err error
-	nextTrack, err = getNextSongByVotesExcludeURI(excludeUri)
+	if voteToSkipEnabled {
+		nextTrack, err = getNextSongRandomExcludeURI(excludeUri)
+	} else {
+		nextTrack, err = getNextSongByVotesExcludeURI(excludeUri)
+	}
 	if err != nil {
 		// Assume no record - get from fallback playlist
 		nextTrack = assignFallback(nextTrack)
@@ -46,6 +50,14 @@ func getNextSongRandom() (Track, error) {
 	return track, nil
 }
 
+func getNextSongRandomExcludeURI(excludeUri spotify.URI) (Track, error) {
+	var track Track
+	if err := db.Raw("SELECT * FROM tracks AND uri != ? ORDER BY random()", excludeUri).First(&track).Error; err != nil {
+		return track, err
+	}
+	return track, nil
+}
+
 func getNextSongByVotes() (Track, error) {
 	var track Track
 	if err := db.Raw("SELECT * FROM tracks WHERE votes = ( SELECT MAX(votes) FROM tracks )").First(&track).Error; err != nil {