fixed "random" disconnects of KittyBot while playing music

KittyBot-Org · Jan 29, 2021 · 4646b4e · 4646b4e
1 parent ff163f5
commit 4646b4e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/de/kittybot/kittybot/commands/music/VolumeCommand.java b/src/main/java/de/kittybot/kittybot/commands/music/VolumeCommand.java
@@ -27,7 +27,7 @@ public void run(Options options, CommandContext ctx){
 		}
 		int volume = options.getInt("volume");
 		if(volume < 0 || volume > 100){
-			ctx.error("Volume");
+			ctx.error("Volume needs to between 0 and 100");
 			return;
 		}
 		player.setVolume(volume);

diff --git a/src/main/java/de/kittybot/kittybot/commands/roles/RolesCommand.java b/src/main/java/de/kittybot/kittybot/commands/roles/RolesCommand.java
@@ -48,14 +48,14 @@ public void run(Options options, CommandContext ctx){
 			var groupName = options.getString("group");
 
 			emoteAction.queue(emote -> {
-				var group = ctx.get(SettingsModule.class).getSelfAssignableRoleGroups(ctx.getGuildId()).stream().filter(g -> g.getName().equalsIgnoreCase(groupName)).findFirst();
-				if(group.isEmpty()){
-					ctx.error("Please provide a valid group");
-					return;
-				}
-
-				ctx.get(SettingsModule.class).addSelfAssignableRoles(ctx.getGuildId(), Collections.singleton(new SelfAssignableRole(roleId, emote.getIdLong(), ctx.getGuildId(), group.get().getId())));
-				ctx.reply("Added self assignable role");
+					var group = ctx.get(SettingsModule.class).getSelfAssignableRoleGroups(ctx.getGuildId()).stream().filter(g -> g.getName().equalsIgnoreCase(groupName)).findFirst();
+					if(group.isEmpty()){
+						ctx.error("Please provide a valid group");
+						return;
+					}
+
+					ctx.get(SettingsModule.class).addSelfAssignableRoles(ctx.getGuildId(), Collections.singleton(new SelfAssignableRole(roleId, emote.getIdLong(), ctx.getGuildId(), group.get().getId())));
+					ctx.reply("Added self assignable role");
 				}, error -> ctx.error("Please provide a valid emote from this server")
 			);
 

diff --git a/src/main/java/de/kittybot/kittybot/objects/music/MusicPlayer.java b/src/main/java/de/kittybot/kittybot/objects/music/MusicPlayer.java
@@ -200,6 +200,7 @@ public void onPlayerResume(IPlayer player){
 	@Override
 	public void onTrackStart(IPlayer player, AudioTrack track){
 		sendMusicController();
+		cancelDestroy();
 	}
 
 	@Override
@@ -215,6 +216,7 @@ public void onTrackEnd(IPlayer player, AudioTrack track, AudioTrackEndReason end
 	public void next(){
 		var next = this.queue.poll();
 		if(next == null){
+			this.player.stopTrack();
 			planDestroy();
 			return;
 		}
@@ -226,7 +228,7 @@ public void planDestroy(){
 		if(this.future != null){
 			return;
 		}
-		this.future = this.modules.schedule(() -> this.modules.get(MusicModule.class).destroy(this.guildId, -1L), 3, TimeUnit.MINUTES);
+		this.future = this.modules.schedule(() -> this.modules.get(MusicModule.class).destroy(this.guildId, -1L), 4, TimeUnit.MINUTES);
 	}
 
 	public void updateMusicController(){

diff --git a/src/main/resources/messages/status_messages.txt b/src/main/resources/messages/status_messages.txt
@@ -2,7 +2,6 @@ watching you 👀
 watching ${total_guilds} guilds 👀
 watching ${total_users} users 👀
 playing with new slash commands
-competing with Xenia
 playing JDA
 watching JDA
 watching Discord