fix: reshuffling not working

foldaway · May 6, 2020 · d7f7f02 · d7f7f02
1 parent a58e68d
commit d7f7f02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/models/guild_session.go b/models/guild_session.go
@@ -124,8 +124,8 @@ func (guildSession *GuildSession) Loop() {
 		if err == nil {
 			volume = volumeConv
 		}
-		guildSession.PlayYouTube(fmt.Sprintf("https://www.youtube.com/watch?v=%s", song.VideoID), volume)
 		guildSession.History = append(guildSession.History, song.VideoID)
+		guildSession.PlayYouTube(fmt.Sprintf("https://www.youtube.com/watch?v=%s", song.VideoID), volume)
 		guildSession.RWMutex.Lock()
 		if len(guildSession.Queue) > 0 {
 			guildSession.Queue = guildSession.Queue[1:]

diff --git a/util/youtube.go b/util/youtube.go
@@ -103,7 +103,7 @@ func GenerateAutoPlaylistQueueItem(videoIdsToAvoid []string) (*youtube.PlaylistI
 		return nil, fmt.Errorf("Nothing in cache, unable to generate")
 	}
 
-	for chosenListing == nil || chosenListing.Snippet == nil {
+	for {
 		chosenListing = autoPlaylistItemCache[rand.Intn(len(autoPlaylistItemCache))]
 
 		snippetsResp, err := youtubeService.
@@ -120,6 +120,7 @@ func GenerateAutoPlaylistQueueItem(videoIdsToAvoid []string) (*youtube.PlaylistI
 
 		if stringInSlice(snippetsResp.Items[0].Id, videoIdsToAvoid) {
 			// Played before
+			log.Println("Reshuffling, played before")
 			continue
 		}
 
@@ -128,6 +129,7 @@ func GenerateAutoPlaylistQueueItem(videoIdsToAvoid []string) (*youtube.PlaylistI
 			ChannelTitle: snippetsResp.Items[0].Snippet.ChannelTitle,
 			Thumbnails:   snippetsResp.Items[0].Snippet.Thumbnails,
 		}
+		break
 
 	}