Major fixes to music system, youtube search working, a queue system, skip and stop, reload works, quit works, ping works. General refactors.

modules/modules.txt

@@ -1,5 +1,6 @@
 pingcommand
-pongcommand
 playMusic
 quit
 reload
+skipMusic
+stopMusic

modules/pauseMusic/main.rb

@@ -0,0 +1,66 @@
+def playMusic_initialize(bot, bang)
+	bot.message(start_with: "#{bang}Play ") do |event|
+		 playMusic(bot, event, bang)
+	end
+	
+	bot.message(with_text: "#{bang}Play") do |event|
+		event.respond "Please provide youtube link!"
+	end
+end
+
+def playMusic_defined()
+	puts "This should not run"
+end
+
+def playMusic(bot, event, bang)
+	message = event.content
+	author = event.author
+	voice_channel = event.author.voice_channel.id
+	server = event.server
+	arguments = message.sub("#{bang}Play ", '').split.first
+	#event.voice.play_file('./example.mp3')
+	if arguments.include? "&list"
+		event.respond "Do not play playlists. They are unsupported."
+	elsif ENV["#{voice_channel}"] == 'playing'
+		event.respond "Music currently playing. Adding to queue"
+		if $queue.key?(voice_channel) == false
+			$queue[voice_channel] = Array.new
+			$queue[voice_channel].push arguments
+			puts $queue[voice_channel]
+		else
+			$queue[voice_channel].push arguments
+			puts $queue[voice_channel]
+		end
+	elsif arguments.include? "youtu"
+		actuallyPlayMusic(bot, event, arguments, voice_channel, server)
+	else
+		event.respond "Invalid youtube link!"
+	end
+end
+
+def actuallyPlayMusic(bot, event, arguments, voice_channel, server)
+	event.respond "Playing song! This may take some time."
+	bot.voice_connect(voice_channel)
+	ENV["#{voice_channel}"] = 'playing'
+	tempFile = Dir::Tmpname.create(['youtubedlruby-', '.mp3']) {} 
+	cmd = "yt-dlp --extract-audio --audio-format mp3 --output " + tempFile + " " + arguments
+	if arguments.include? "youtu"
+		system(cmd)
+	end
+	event.voice.play_file(tempFile)
+	File.delete(tempFile) if File.exist?(tempFile)
+	if $queue.key?(voice_channel) == true
+		if $queue[voice_channel][0] != nil
+			event.respond "Queue exists. Playing next song."
+			actuallyPlayMusic(bot, event, $queue[voice_channel].shift, voice_channel, server)
+		else 
+			bot.voice_destroy(server)
+			event.respond "Done playing!"
+			ENV["#{voice_channel}"] = 'open'
+		end
+	else
+		bot.voice_destroy(server)
+		event.respond "Done playing!"
+		ENV["#{voice_channel}"] = 'open'
+	end
+end

modules/pingcommand/main.rb

@@ -1,9 +1,11 @@
-def pingcommand_initialize(bot, bang)
+def pingcommand_main(event)
-	bot.message(with_text: "#{bang}Ping") do |event|
+	event.respond "Ping!"
-		ping(bot, event)
-	end
 end
 
-def ping(bot, event)
+def pingcommand_getName()
-	event.respond 'Pong!'
+	return "ping"
+end
+
+def pingcommand_getCommand()
+	return "pingcommand_main"
 end

modules/playMusic/main.rb

@@ -1,27 +1,20 @@
-def playMusic_initialize(bot, bang)
+def playMusic_getName()
-	bot.message(start_with: "#{bang}Play ") do |event|
+	return "play"
-		 playMusic(bot, event, bang)
-	end
-	
-	bot.message(with_text: "#{bang}Play") do |event|
-		event.respond "Please provide youtube link!"
-	end
 end
 
-def playMusic_defined()
+def playMusic_getCommand()
-	puts "This should not run"
+	return "playMusic_main"
 end
 
-def playMusic(bot, event, bang)
+def playMusic_main(event)
 	message = event.content
-	author = event.author
+	if message == ''
-	voice_channel = author.voice_channel.id
+		event.respond "Please add a search query"
-	server = event.server
+	else
-	arguments = message.sub("#{bang}Play ", '').split.first
+		voice_channel = event.author.voice_channel.id
+		arguments = message.sub("!Play ", '').chomp
 		#event.voice.play_file('./example.mp3')
-	if arguments.include? "&list"
+		if ENV["#{voice_channel}"] == 'playing'
-		event.respond "Do not play playlists. They are unsupported."
-	elsif ENV["#{voice_channel}"] == 'playing'
 			event.respond "Music currently playing. Adding to queue"
 			if $queue.key?(voice_channel) == false
 				$queue[voice_channel] = Array.new
@@ -31,35 +24,49 @@ def playMusic(bot, event, bang)
 				$queue[voice_channel].push arguments
 				puts $queue[voice_channel]
 			end
-	elsif arguments.include? "youtu"
-		actuallyPlayMusic(bot, event, arguments, voice_channel, server)
 		else
-		event.respond "Invalid youtube link!"
+			actuallyPlayMusic(event, arguments, voice_channel)
+		end
 	end
 end
 
-def actuallyPlayMusic(bot, event, arguments, voice_channel, server)
+def actuallyPlayMusic(event, arguments, voice_channel)
-	event.respond "Playing song! This may take some time."
+	event.respond "Searching for song! This may take some time."
-	bot.voice_connect(voice_channel)
 	ENV["#{voice_channel}"] = 'playing'
+	if $voicebots.key?(voice_channel) == false
+		voiceBot = $bot.voice_connect(voice_channel)
+		$voicebots[voice_channel] = voiceBot
+		puts "Instance 1"
+	else
+		voiceBot = $voicebots[voice_channel]
+		puts "Instance 2"
+	end
 	tempFile = Dir::Tmpname.create(['youtubedlruby-', '.mp3']) {}
-	cmd = "yt-dlp --extract-audio --audio-format mp3 --output " + tempFile + " " + arguments
+	id = `yt-dlp --get-id 'ytsearch:#{arguments}'`
-	if arguments.include? "youtu"
+	puts id
+	name = `yt-dlp --get-title #{id}`
+	puts name
+	cmd = "yt-dlp --extract-audio --audio-format mp3 --output " + tempFile + " https://www.youtube.com/watch?v=#{id}"
 	system(cmd)
-	end
+	puts "#{arguments}"
-	event.voice.play_file(tempFile)
+	event.respond "Playing #{name.chomp}!"
+	voiceBot.play_file(tempFile)
+	#puts arguments
+	#puts tempFile
 	File.delete(tempFile) if File.exist?(tempFile)
 	if $queue.key?(voice_channel) == true
 		if $queue[voice_channel][0] != nil
 			event.respond "Queue exists. Playing next song."
-			actuallyPlayMusic(bot, event, $queue[voice_channel].shift, voice_channel, server)
+			actuallyPlayMusic(event, $queue[voice_channel].shift, voice_channel)
 		else 
-			bot.voice_destroy(server)
+			$voicebots.delete(voice_channel)
+			voiceBot.destroy()
 			event.respond "Done playing!"
 			ENV["#{voice_channel}"] = 'open'
 		end
 	else
-		bot.voice_destroy(server)
+		$voicebots.delete(voice_channel)
+		voiceBot.destroy()
 		event.respond "Done playing!"
 		ENV["#{voice_channel}"] = 'open'
 	end

modules/quit/main.rb

@@ -1,14 +1,16 @@
-def quit_initialize(bot, bang)
+def quit_main(event)
-	bot.message(with_text: "#{bang}Quit") do |event|
-		quit(bot, event)
-	end
-end
-
-def quit(bot, event)
 	if event.user.id == 185533351866662913
-		bot.send_message(event.channel.id, 'Bot is shutting down')
+		$bot.send_message(event.channel.id, 'Bot is shutting down')
-		bot.stop
+		$bot.stop
 	else
 		event.respond "You cannot quit this bot!"
 	end
 end
+
+def quit_getName()
+	return "quit"
+end
+
+def quit_getCommand()
+	return "quit_main"
+end

modules/reload/main.rb

@@ -1,19 +1,12 @@
-def reload_initialize(bot, bang)
+def reload_getName()
-	bot.message(with_text: "#{bang}Reload") do |event|
+	return "reload"
-		reload(event)
-	end
 end
 
-def reload(event)
+def reload_getCommand()
-	event.respond 'Reloading!'
+	return "reload_main"
-	File.foreach("modules/modules.txt", chop: true) { |line|
+end
-		mod = "./modules/" + line + "/main.rb"
+
-		code = "defined? #{line.delete("\n")}_initialize"
+def reload_main(event)
-		if eval(code) == nil
+	emery_loadModules
-			load mod.delete("\n")
+	event.respond "Reloading!"
-			send("#{line.delete("\n")}_initialize", bot, bang)
-		else
-			load mod.delete("\n")
-		end
-	}
 end

modules/skipMusic/main.rb

@@ -0,0 +1,19 @@
+def skipMusic_getName()
+	return "skip"
+end
+
+def skipMusic_getCommand()
+	return "skipMusic_main"
+end
+
+def skipMusic_main(event)
+	voice_channel = event.author.voice_channel.id
+	if ENV["#{voice_channel}"] == 'playing'
+		event.respond "Skipping currently playing song"
+		voiceBot = $voicebots[voice_channel]
+		voiceBot.stop_playing()
+		ENV["#{voice_channel}"] = 'open'
+	else
+		event.respond "Bot not playing!"
+	end
+end

modules/stopMusic/main.rb

@@ -0,0 +1,24 @@
+def stopMusic_getName()
+	return "stop"
+end
+
+def stopMusic_getCommand()
+	return "stopMusic_main"
+end
+
+
+def stopMusic_main(event)
+	voice_channel = event.author.voice_channel.id
+	if ENV["#{voice_channel}"] == 'playing'
+		event.respond "Stopping music"
+		while $queue[voice_channel][0] != nil
+			puts "Stop 2"
+			$queue[voice_channel].pop
+		end
+		voiceBot = $voicebots[voice_channel]
+		voiceBot.destroy()
+		ENV["#{voice_channel}"] = 'open'
+	else
+		event.respond "Bot not playing!"
+	end
+end