fix: responses

Lulalaby · Lulalaby · commit 6d445aeb9821 · 2025-01-22T20:37:55.000+01:00
diff --git a/DisCatSharp.Extensions.SimpleMusicCommands/Commands/MusicCommands.cs b/DisCatSharp.Extensions.SimpleMusicCommands/Commands/MusicCommands.cs
@@ -90,7 +90,7 @@ public async Task DisconnectAsync(InteractionContext ctx)
 		[SlashCommand("pause", "Pauses the playback")]
 		public async Task PauseAsync(InteractionContext ctx)
 		{
-			await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Please wait.."));
+			await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Pausing.."));
 			try
 			{
 				ArgumentNullException.ThrowIfNull(ctx.Guild);
@@ -112,7 +112,7 @@ public async Task PauseAsync(InteractionContext ctx)
 		[SlashCommand("resume", "Resumes the playback")]
 		public async Task ResumeAsync(InteractionContext ctx)
 		{
-			await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Please wait.."));
+			await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Resuming.."));
 			try
 			{
 				ArgumentNullException.ThrowIfNull(ctx.Guild);
@@ -204,7 +204,7 @@ public async Task NowPlayingAsync(InteractionContext ctx)
 			}
 			catch (ArgumentNullException)
 			{
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and are playing a song currently."));
 			}
 			catch (Exception ex)
 			{
@@ -226,7 +226,7 @@ public async Task SetVolumeAsync(InteractionContext ctx, [Option("volume", "The
 				var player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);
 				ArgumentNullException.ThrowIfNull(player);
 				await player.SetVolumeAsync(volume);
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Success!"));
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"Success! Set volume to {volume}%"));
 			}
 			catch (ArgumentNullException)
 			{
@@ -247,12 +247,13 @@ public async Task SeekAsync(InteractionContext ctx, [Option("position", "The tot
 				ArgumentNullException.ThrowIfNull(ctx.Guild);
 				var player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);
 				ArgumentNullException.ThrowIfNull(player);
-				await player.SeekAsync(TimeSpan.FromSeconds(seconds));
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Success!"));
+				var ts = TimeSpan.FromSeconds(seconds);
+				await player.SeekAsync(ts);
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"Success! Seeked to {ts}"));
 			}
 			catch (ArgumentNullException)
 			{
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and are currently playing a song."));
 			}
 			catch (Exception ex)
 			{
@@ -274,10 +275,12 @@ public async Task PlayQueueAsync(InteractionContext ctx)
 				var player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);
 				ArgumentNullException.ThrowIfNull(player);
 				player.PlayQueue();
+				player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"Playing {player!.CurrentTrack!.Info.Title.Bold} from {player.CurrentTrack.Info.Author.Italic}"));
 			}
 			catch (ArgumentNullException)
 			{
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel. And you added songs to the queue."));
 			}
 			catch (Exception ex)
 			{
@@ -383,7 +386,7 @@ public async Task ShuffleQueueAsync(InteractionContext ctx)
 			}
 			catch (ArgumentNullException)
 			{
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and have songs in the queue."));
 			}
 			catch (Exception ex)
 			{
@@ -405,7 +408,7 @@ public async Task ClearQueueAsync(InteractionContext ctx)
 			}
 			catch (ArgumentNullException)
 			{
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and have songs in the queue."));
 			}
 			catch (Exception ex)
 			{
@@ -427,7 +430,7 @@ public async Task ReverseQueueAsync(InteractionContext ctx)
 			}
 			catch (ArgumentNullException)
 			{
-				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));
+				await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and have songs in the queue."));
 			}
 			catch (Exception ex)
 			{

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public async Task DisconnectAsync(InteractionContext ctx)`
`90`	`90`	`[SlashCommand("pause", "Pauses the playback")]`
`91`	`91`	`public async Task PauseAsync(InteractionContext ctx)`
`92`	`92`	`{`
`93`		`- await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Please wait.."));`
	`93`	`+ await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Pausing.."));`
`94`	`94`	`try`
`95`	`95`	`{`
`96`	`96`	`ArgumentNullException.ThrowIfNull(ctx.Guild);`
`@@ -112,7 +112,7 @@ public async Task PauseAsync(InteractionContext ctx)`
`112`	`112`	`[SlashCommand("resume", "Resumes the playback")]`
`113`	`113`	`public async Task ResumeAsync(InteractionContext ctx)`
`114`	`114`	`{`
`115`		`- await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Please wait.."));`
	`115`	`+ await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral().WithContent("Resuming.."));`
`116`	`116`	`try`
`117`	`117`	`{`
`118`	`118`	`ArgumentNullException.ThrowIfNull(ctx.Guild);`
`@@ -204,7 +204,7 @@ public async Task NowPlayingAsync(InteractionContext ctx)`
`204`	`204`	`}`
`205`	`205`	`catch (ArgumentNullException)`
`206`	`206`	`{`
`207`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));`
	`207`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and are playing a song currently."));`
`208`	`208`	`}`
`209`	`209`	`catch (Exception ex)`
`210`	`210`	`{`
`@@ -226,7 +226,7 @@ public async Task SetVolumeAsync(InteractionContext ctx, [Option("volume", "The`
`226`	`226`	`var player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);`
`227`	`227`	`ArgumentNullException.ThrowIfNull(player);`
`228`	`228`	`await player.SetVolumeAsync(volume);`
`229`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Success!"));`
	`229`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"Success! Set volume to {volume}%"));`
`230`	`230`	`}`
`231`	`231`	`catch (ArgumentNullException)`
`232`	`232`	`{`
`@@ -247,12 +247,13 @@ public async Task SeekAsync(InteractionContext ctx, [Option("position", "The tot`
`247`	`247`	`ArgumentNullException.ThrowIfNull(ctx.Guild);`
`248`	`248`	`var player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);`
`249`	`249`	`ArgumentNullException.ThrowIfNull(player);`
`250`		`- await player.SeekAsync(TimeSpan.FromSeconds(seconds));`
`251`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Success!"));`
	`250`	`+ var ts = TimeSpan.FromSeconds(seconds);`
	`251`	`+ await player.SeekAsync(ts);`
	`252`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"Success! Seeked to {ts}"));`
`252`	`253`	`}`
`253`	`254`	`catch (ArgumentNullException)`
`254`	`255`	`{`
`255`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));`
	`256`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and are currently playing a song."));`
`256`	`257`	`}`
`257`	`258`	`catch (Exception ex)`
`258`	`259`	`{`
`@@ -274,10 +275,12 @@ public async Task PlayQueueAsync(InteractionContext ctx)`
`274`	`275`	`var player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);`
`275`	`276`	`ArgumentNullException.ThrowIfNull(player);`
`276`	`277`	`player.PlayQueue();`
	`278`	`+ player = ctx.Client.GetLavalink().GetGuildPlayer(ctx.Guild);`
	`279`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"Playing {player!.CurrentTrack!.Info.Title.Bold} from {player.CurrentTrack.Info.Author.Italic}"));`
`277`	`280`	`}`
`278`	`281`	`catch (ArgumentNullException)`
`279`	`282`	`{`
`280`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));`
	`283`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel. And you added songs to the queue."));`
`281`	`284`	`}`
`282`	`285`	`catch (Exception ex)`
`283`	`286`	`{`
`@@ -383,7 +386,7 @@ public async Task ShuffleQueueAsync(InteractionContext ctx)`
`383`	`386`	`}`
`384`	`387`	`catch (ArgumentNullException)`
`385`	`388`	`{`
`386`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));`
	`389`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and have songs in the queue."));`
`387`	`390`	`}`
`388`	`391`	`catch (Exception ex)`
`389`	`392`	`{`
`@@ -405,7 +408,7 @@ public async Task ClearQueueAsync(InteractionContext ctx)`
`405`	`408`	`}`
`406`	`409`	`catch (ArgumentNullException)`
`407`	`410`	`{`
`408`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));`
	`411`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and have songs in the queue."));`
`409`	`412`	`}`
`410`	`413`	`catch (Exception ex)`
`411`	`414`	`{`
`@@ -427,7 +430,7 @@ public async Task ReverseQueueAsync(InteractionContext ctx)`
`427`	`430`	`}`
`428`	`431`	`catch (ArgumentNullException)`
`429`	`432`	`{`
`430`		`- await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel."));`
	`433`	`+ await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Make sure you're connected to a channel and have songs in the queue."));`
`431`	`434`	`}`
`432`	`435`	`catch (Exception ex)`
`433`	`436`	`{`