Reduce boilerplate in command data checks

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

Commands/BanCommandGroup.cs

@@ -65,15 +65,13 @@ public class BanCommandGroup : CommandGroup {
     [RequireBotDiscordPermissions(DiscordPermission.BanMembers)]
     [Description("банит пидора")]
     public async Task<Result> BanUserAsync(
-        [Description("юзер кого банить")] IUser target, [Description("причина зачем банить")] string reason,
+        [Description("юзер кого банить")]     IUser  target,
-        TimeSpan?                               duration = null) {
+        [Description("причина зачем банить")] string reason,
-        // Data checks
+        [Description("продолжительность бана")]
-        if (!_context.TryGetGuildID(out var guildId))
+        TimeSpan? duration = null) {
-            return Result.FromError(new ArgumentNullError(nameof(guildId)));
+        if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
-        if (!_context.TryGetUserID(out var userId))
+            return Result.FromError(
-            return Result.FromError(new ArgumentNullError(nameof(userId)));
+                new ArgumentNullError(nameof(_context), "Unable to retrieve necessary IDs from command context"));
-        if (!_context.TryGetChannelID(out var channelId))
-            return Result.FromError(new ArgumentNullError(nameof(channelId)));
 
         // The current user's avatar is used when sending error messages
         var currentUserResult = await _userApi.GetCurrentUserAsync(CancellationToken);
@@ -180,7 +178,10 @@ public class BanCommandGroup : CommandGroup {
     [RequireDiscordPermission(DiscordPermission.BanMembers)]
     [RequireBotDiscordPermissions(DiscordPermission.BanMembers)]
     [Description("разбанит пидора")]
-    public async Task<Result> UnbanUserAsync([Description("Юзер, кого разбанить")] IUser target, string reason) {
+    public async Task<Result> UnbanUserAsync(
+        [Description("юзер кого разбанить")] IUser target,
+        [Description("причина зачем разбанить")]
+        string reason) {
         // Data checks
         if (!_context.TryGetGuildID(out var guildId))
             return Result.FromError(new ArgumentNullError(nameof(guildId)));

Commands/KickCommandGroup.cs

@@ -8,7 +8,6 @@ using Remora.Discord.API.Abstractions.Rest;
 using Remora.Discord.API.Objects;
 using Remora.Discord.Commands.Conditions;
 using Remora.Discord.Commands.Contexts;
-using Remora.Discord.Commands.Extensions;
 using Remora.Discord.Commands.Feedback.Services;
 using Remora.Discord.Extensions.Embeds;
 using Remora.Results;
@@ -58,14 +57,11 @@ public class KickCommandGroup : CommandGroup {
     [RequireBotDiscordPermissions(DiscordPermission.KickMembers)]
     [Description("кикает твоего друга <3")]
     public async Task<Result> KickUserAsync(
-        [Description("друг которого кикать")] IUser target, [Description("причина зачем кикать")] string reason) {
+        [Description("друг которого кикать")] IUser  target,
-        // Data checks
+        [Description("причина зачем кикать")] string reason) {
-        if (!_context.TryGetGuildID(out var guildId))
+        if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
-            return Result.FromError(new ArgumentNullError(nameof(guildId)));
+            return Result.FromError(
-        if (!_context.TryGetUserID(out var userId))
+                new ArgumentNullError(nameof(_context), "Unable to retrieve necessary IDs from command context"));
-            return Result.FromError(new ArgumentNullError(nameof(userId)));
-        if (!_context.TryGetChannelID(out var channelId))
-            return Result.FromError(new ArgumentNullError(nameof(channelId)));
 
         // The current user's avatar is used when sending error messages
         var currentUserResult = await _userApi.GetCurrentUserAsync(CancellationToken);

Commands/MuteCommandGroup.cs

@@ -69,6 +69,7 @@ public class MuteCommandGroup : CommandGroup {
         IUser target,
         [Description("причина зачем мутить друга (пиши заебал)")]
         string reason,
+        [Description("продолжительность мута")]
         TimeSpan duration) {
         // Data checks
         if (!_context.TryGetGuildID(out var guildId))
@@ -181,14 +182,14 @@ public class MuteCommandGroup : CommandGroup {
     [RequireDiscordPermission(DiscordPermission.ModerateMembers)]
     [RequireBotDiscordPermissions(DiscordPermission.ModerateMembers)]
     [Description("ФУНКЦИЯ ФОРС РАЗМУТ КАВАЯ КОЛЕСИКИ!!!!1111111111")]
-    public async Task<Result> UnmuteUserAsync([Description("юзер кого раззамучивать")] IUser target, string reason) {
+    public async Task<Result> UnmuteUserAsync(
-        // Data checks
+        [Description("юзер кого раззамучивать")]
-        if (!_context.TryGetGuildID(out var guildId))
+        IUser target,
-            return Result.FromError(new ArgumentNullError(nameof(guildId)));
+        [Description("причина зачем раззамучивать")]
-        if (!_context.TryGetUserID(out var userId))
+        string reason) {
-            return Result.FromError(new ArgumentNullError(nameof(userId)));
+        if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
-        if (!_context.TryGetChannelID(out var channelId))
+            return Result.FromError(
-            return Result.FromError(new ArgumentNullError(nameof(channelId)));
+                new ArgumentNullError(nameof(_context), "Unable to retrieve necessary IDs from command context"));
 
         // The current user's avatar is used when sending error messages
         var currentUserResult = await _userApi.GetCurrentUserAsync(CancellationToken);

Extensions.cs

@@ -1,9 +1,12 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Text;
 using DiffPlex.DiffBuilder.Model;
 using Remora.Discord.API;
 using Remora.Discord.API.Abstractions.Objects;
 using Remora.Discord.API.Objects;
+using Remora.Discord.Commands.Contexts;
+using Remora.Discord.Commands.Extensions;
 using Remora.Discord.Extensions.Embeds;
 using Remora.Discord.Extensions.Formatting;
 using Remora.Rest.Core;
@@ -141,4 +144,15 @@ public static class Extensions {
         var list = source.ToList();
         return list.Any() ? list.Max(selector) : default;
     }
+
+    public static bool TryGetContextIDs(
+        this                    ICommandContext context,   [NotNullWhen(true)] out Snowflake? guildId,
+        [NotNullWhen(true)] out Snowflake?      channelId, [NotNullWhen(true)] out Snowflake? userId) {
+        guildId = null;
+        channelId = null;
+        userId = null;
+        return context.TryGetGuildID(out guildId)
+               && context.TryGetChannelID(out channelId)
+               && context.TryGetUserID(out userId);
+    }
 }