automatically join voice channel in play command

foldaway · Oct 16, 2019 · 47f4ef0 · 47f4ef0
1 parent 4b59276
commit 47f4ef0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/commands/join.go b/commands/join.go
@@ -12,6 +12,12 @@ import (
 )
 
 func join(s *discordgo.Session, m *discordgo.MessageCreate) {
+	voiceChannelInit(s, m)
+	guildSession := safeGetGuildSession(m.GuildID)
+	go guildSession.Loop()
+}
+
+func voiceChannelInit(s *discordgo.Session, m *discordgo.MessageCreate) {
 	guildSession := safeGetGuildSession(m.GuildID)
 	voiceState, err := util.FindUserVoiceState(s, m.GuildID, m.Author.ID)
 	if err != nil {
@@ -44,5 +50,4 @@ func join(s *discordgo.Session, m *discordgo.MessageCreate) {
 		updateCmd.Run()
 	}
 	guildSession.PlayURL(url, 0.5)
-	go guildSession.Loop()
 }
diff --git a/commands/play.go b/commands/play.go
@@ -20,9 +20,9 @@ var tempSearchResultsCache = make(map[string][]*youtube.SearchResult)
 
 func play(s *discordgo.Session, m *discordgo.MessageCreate) {
 	guildSession := safeGetGuildSession(m.GuildID)
-	if guildSession.VoiceConnection == nil {
-		s.ChannelMessageSend(m.ChannelID, fmt.Sprintf("%s I am not in any voice channel", m.Author.Mention()))
-		return
+	var isNotInVoiceChannel = guildSession.VoiceConnection == nil
+	if isNotInVoiceChannel {
+		voiceChannelInit(s, m)
 	}
 	var b strings.Builder
 	// Terminate if user has a pending search, forgets and uses /play again.
@@ -144,6 +144,9 @@ func play(s *discordgo.Session, m *discordgo.MessageCreate) {
 			}
 			delete(tempSearchResultsCache, mm.Author.ID)
 			awaitFuncRemove()
+			if isNotInVoiceChannel {
+				go guildSession.Loop()
+			}
 		})
 	}