Add /kick command

Boyfriend.cs

@@ -76,7 +76,8 @@ public class Boyfriend {
                         .AddSingleton<UtilityService>()
                         .AddHostedService<GuildUpdateService>()
                         .AddCommandTree()
-                        .WithCommandGroup<BanCommandGroup>();
+                        .WithCommandGroup<BanCommandGroup>()
+                        .WithCommandGroup<KickCommandGroup>();
                     var responderTypes = typeof(Boyfriend).Assembly
                         .GetExportedTypes()
                         .Where(t => t.IsResponder());

Commands/BanCommandGroup.cs

@@ -56,14 +56,14 @@ public class BanCommandGroup : CommandGroup {
     ///     A feedback sending result which may or may not have succeeded. A successful result does not mean that the user
     ///     was banned and vice-versa.
     /// </returns>
-    /// <seealso cref="UnBanUserAsync" />
+    /// <seealso cref="UnbanUserAsync" />
     [Command("ban", "бан")]
     [RequireContext(ChannelContext.Guild)]
     [RequireDiscordPermission(DiscordPermission.BanMembers)]
     [RequireBotDiscordPermissions(DiscordPermission.BanMembers)]
     [Description("банит пидора")]
     public async Task<Result> BanUserAsync(
-        [Description("Юзер, кого банить")] IUser target, string reason, TimeSpan? duration = null) {
+        [Description("юзер кого банить")] IUser target, [Description("причина зачем банить")] string reason, TimeSpan? duration = null) {
         // Data checks
         if (!_context.TryGetGuildID(out var guildId))
             return Result.FromError(new ArgumentNullError(nameof(guildId)));
@@ -122,7 +122,7 @@ public class BanCommandGroup : CommandGroup {
                 || (cfg.PrivateFeedbackChannel is not 0 && cfg.PrivateFeedbackChannel != channelId.Value)) {
                 var logEmbed = new EmbedBuilder().WithSmallTitle(
                         string.Format(Messages.UserBanned, target.GetTag()), target)
-                    .WithDescription(string.Format(Messages.DescriptionUserBanned, reason))
+                    .WithDescription(string.Format(Messages.DescriptionUserPunished, reason))
                     .WithActionFooter(user)
                     .WithCurrentTimestamp()
                     .WithColour(ColorsList.Red)
@@ -169,7 +169,7 @@ 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, string reason) {
         // Data checks
         if (!_context.TryGetGuildID(out var guildId))
             return Result.FromError(new ArgumentNullError(nameof(guildId)));

Commands/KickCommandGroup.cs

@@ -0,0 +1,145 @@
+using System.ComponentModel;
+using Boyfriend.Services;
+using Boyfriend.Services.Data;
+using Remora.Commands.Attributes;
+using Remora.Commands.Groups;
+using Remora.Discord.API.Abstractions.Objects;
+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;
+
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedMember.Global
+
+namespace Boyfriend.Commands;
+
+public class KickCommandGroup : CommandGroup {
+    private readonly IDiscordRestChannelAPI _channelApi;
+    private readonly ICommandContext        _context;
+    private readonly GuildDataService       _dataService;
+    private readonly FeedbackService        _feedbackService;
+    private readonly IDiscordRestGuildAPI   _guildApi;
+    private readonly IDiscordRestUserAPI    _userApi;
+    private readonly UtilityService         _utility;
+
+    public KickCommandGroup(
+        ICommandContext context,         IDiscordRestChannelAPI channelApi, GuildDataService    dataService,
+        FeedbackService feedbackService, IDiscordRestGuildAPI   guildApi,   IDiscordRestUserAPI userApi,
+        UtilityService  utility) {
+        _context = context;
+        _channelApi = channelApi;
+        _dataService = dataService;
+        _feedbackService = feedbackService;
+        _guildApi = guildApi;
+        _userApi = userApi;
+        _utility = utility;
+    }
+
+    /// <summary>
+    ///     A slash command that kicks a Discord user with the specified reason.
+    /// </summary>
+    /// <param name="target">The user to kick.</param>
+    /// <param name="reason">
+    ///     The reason for this kick. Must be encoded with <see cref="Extensions.EncodeHeader" /> when passed to
+    ///     <see cref="IDiscordRestGuildAPI.RemoveGuildMemberAsync" />.
+    /// </param>
+    /// <returns>
+    ///     A feedback sending result which may or may not have succeeded. A successful result does not mean that the user
+    ///     was kicked and vice-versa.
+    /// </returns>
+    [Command("kick", "кик")]
+    [RequireContext(ChannelContext.Guild)]
+    [RequireDiscordPermission(DiscordPermission.KickMembers)]
+    [RequireBotDiscordPermissions(DiscordPermission.KickMembers)]
+    [Description("кикает твоего друга <3")]
+    public async Task<Result> KickUserAsync(
+        [Description("друг которого кикать")] IUser target, [Description("причина зачем кикать")] string reason) {
+        // Data checks
+        if (!_context.TryGetGuildID(out var guildId))
+            return Result.FromError(new ArgumentNullError(nameof(guildId)));
+        if (!_context.TryGetUserID(out var userId))
+            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);
+        if (!currentUserResult.IsDefined(out var currentUser))
+            return Result.FromError(currentUserResult);
+
+        var data = await _dataService.GetData(guildId.Value, CancellationToken);
+        var cfg = data.Configuration;
+        Messages.Culture = data.Culture;
+
+        var existingKickResult = await _guildApi.GetGuildMemberAsync(guildId.Value, target.ID);
+        if (!existingKickResult.IsSuccess) {
+            var embed = new EmbedBuilder().WithSmallTitle(Messages.UserNotFoundShort, currentUser)
+                .WithColour(ColorsList.Red).Build();
+
+            if (!embed.IsDefined(out var alreadyBuilt))
+                return Result.FromError(embed);
+
+            return (Result)await _feedbackService.SendContextualEmbedAsync(alreadyBuilt, ct: CancellationToken);
+        }
+
+        var interactionResult
+            = await _utility.CheckInteractionsAsync(guildId.Value, userId.Value, target.ID, "Kick", CancellationToken);
+        if (!interactionResult.IsSuccess)
+            return Result.FromError(interactionResult);
+
+        Result<Embed> responseEmbed;
+        if (interactionResult.Entity is not null) {
+            responseEmbed = new EmbedBuilder().WithSmallTitle(interactionResult.Entity, currentUser)
+                .WithColour(ColorsList.Red).Build();
+        } else {
+            var userResult = await _userApi.GetUserAsync(userId.Value, CancellationToken);
+            if (!userResult.IsDefined(out var user))
+                return Result.FromError(userResult);
+
+            var kickResult = await _guildApi.RemoveGuildMemberAsync(
+                guildId.Value, target.ID, reason: $"({user.GetTag()}) {reason.EncodeHeader()}",
+                ct: CancellationToken);
+            if (!kickResult.IsSuccess)
+                return Result.FromError(kickResult.Error);
+
+            responseEmbed = new EmbedBuilder().WithSmallTitle(
+                    string.Format(Messages.UserKicked, target.GetTag()), target)
+                .WithColour(ColorsList.Green).Build();
+
+            if ((cfg.PublicFeedbackChannel is not 0 && cfg.PublicFeedbackChannel != channelId.Value)
+                || (cfg.PrivateFeedbackChannel is not 0 && cfg.PrivateFeedbackChannel != channelId.Value)) {
+                var logEmbed = new EmbedBuilder().WithSmallTitle(
+                        string.Format(Messages.UserKicked, target.GetTag()), target)
+                    .WithDescription(string.Format(Messages.DescriptionUserPunished, reason))
+                    .WithActionFooter(user)
+                    .WithCurrentTimestamp()
+                    .WithColour(ColorsList.Red)
+                    .Build();
+
+                if (!logEmbed.IsDefined(out var logBuilt))
+                    return Result.FromError(logEmbed);
+
+                var builtArray = new[] { logBuilt };
+                // Not awaiting to reduce response time
+                if (cfg.PrivateFeedbackChannel != channelId.Value)
+                    _ = _channelApi.CreateMessageAsync(
+                        cfg.PrivateFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray,
+                        ct: CancellationToken);
+                if (cfg.PublicFeedbackChannel != channelId.Value)
+                    _ = _channelApi.CreateMessageAsync(
+                        cfg.PublicFeedbackChannel.ToDiscordSnowflake(), embeds: builtArray,
+                        ct: CancellationToken);
+            }
+        }
+
+        if (!responseEmbed.IsDefined(out var built))
+            return Result.FromError(responseEmbed);
+
+        return (Result)await _feedbackService.SendContextualEmbedAsync(built, ct: CancellationToken);
+    }
+}

Messages.resx

@@ -486,13 +486,28 @@
     <data name="DescriptionExternalEventStarted" xml:space="preserve">
     <value>The event is happening at {0} until {1}</value>
   </data>
-    <data name="DescriptionUserBanned" xml:space="preserve">
-        <value>Reason: {0}</value>
-    </data>
     <data name="UserAlreadyBanned" xml:space="preserve">
     <value>This user is already banned!</value>
   </data>
     <data name="UserUnbanned" xml:space="preserve">
     <value>{0} was unbanned</value>
   </data>
+    <data name="UserMuted" xml:space="preserve">
+    <value>{0} was muted</value>
+  </data>
+    <data name="UserUnmuted" xml:space="preserve">
+    <value>{0} was unmuted</value>
+  </data>
+    <data name="UserNotMuted" xml:space="preserve">
+    <value>This member is not muted!</value>
+  </data>
+    <data name="UserNotFoundShort" xml:space="preserve">
+    <value>I could not find this user!</value>
+  </data>
+    <data name="UserKicked" xml:space="preserve">
+    <value>{0} was kicked</value>
+  </data>
+    <data name="DescriptionUserPunished" xml:space="preserve">
+    <value>Reason: {0}</value>
+  </data>
 </root>

Messages.ru.resx

@@ -486,13 +486,28 @@
     <data name="DescriptionExternalEventStarted" xml:space="preserve">
     <value>Событие происходит в {0} до {1}</value>
   </data>
-    <data name="DescriptionUserBanned" xml:space="preserve">
-        <value>Причина: {0}</value>
-    </data>
     <data name="UserAlreadyBanned" xml:space="preserve">
     <value>Этот пользователь уже забанен!</value>
   </data>
     <data name="UserUnbanned" xml:space="preserve">
     <value>{0} был(-а) разбанен(-а)</value>
   </data>
+    <data name="UserMuted" xml:space="preserve">
+    <value>{0} был(-а) заглушен(-а)</value>
+  </data>
+    <data name="UserNotMuted" xml:space="preserve">
+    <value>Этот участник не заглушен!</value>
+  </data>
+    <data name="UserUnmuted" xml:space="preserve">
+    <value>{0} был(-а) разглушен(-а)</value>
+  </data>
+    <data name="UserNotFoundShort" xml:space="preserve">
+    <value>Я не смог найти этого пользователя!</value>
+  </data>
+    <data name="UserKicked" xml:space="preserve">
+    <value>{0} был(-а) выгнан(-а)</value>
+  </data>
+    <data name="DescriptionUserPunished" xml:space="preserve">
+    <value>Причина: {0}</value>
+  </data>
 </root>

Messages.tt-ru.resx

@@ -486,13 +486,28 @@
     <data name="DescriptionExternalEventStarted" xml:space="preserve">
     <value>движуха происходит в {0} до {1}</value>
   </data>
-    <data name="DescriptionUserBanned" xml:space="preserve">
-        <value>причина: {0}</value>
-    </data>
     <data name="UserAlreadyBanned" xml:space="preserve">
     <value>этот шизоид уже лежит в бане</value>
   </data>
     <data name="UserUnbanned" xml:space="preserve">
     <value>{0} раззабанен</value>
   </data>
+    <data name="UserMuted" xml:space="preserve">
+    <value>{0} в муте</value>
+  </data>
+    <data name="UserUnmuted" xml:space="preserve">
+    <value>{0} в размуте</value>
+  </data>
+    <data name="UserNotMuted" xml:space="preserve">
+    <value>этого шизоида никто не мутил.</value>
+  </data>
+    <data name="UserNotFoundShort" xml:space="preserve">
+    <value>у нас такого шизоида нету...</value>
+  </data>
+    <data name="UserKicked" xml:space="preserve">
+    <value>{0} вышел с посторонней помощью</value>
+  </data>
+    <data name="DescriptionUserPunished" xml:space="preserve">
+    <value>причина: {0}</value>
+  </data>
 </root>