forgor 💀

Boyfriend/CommandProcessor.cs

@@ -167,7 +167,7 @@ public sealed class CommandProcessor {
         return Context.Guild.GetUser(id);
     }
 
-    public SocketGuildUser? GetMember(string[] args, int index, string? argument) {
+    public SocketGuildUser? GetMember(string[] args, int index) {
         if (index >= args.Length) {
             Utils.SafeAppendToBuilder(_stackedReplyMessage, $"{ReplyEmojis.MissingArgument} {Messages.MissingMember}",
                 Context.Message);

Boyfriend/Commands/KickCommand.cs

@@ -8,7 +8,7 @@ public sealed class KickCommand : ICommand {
     public string[] Aliases { get; } = { "kick", "кик", "выгнать" };
 
     public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
-        var toKick = cmd.GetMember(args, 0, "ToKick");
+        var toKick = cmd.GetMember(args, 0);
         if (toKick is null || !cmd.HasPermission(GuildPermission.KickMembers)) return;
 
         if (cmd.CanInteractWith(toKick, "Kick"))

Boyfriend/Commands/MuteCommand.cs

@@ -8,7 +8,7 @@ public sealed class MuteCommand : ICommand {
     public string[] Aliases { get; } = { "mute", "timeout", "заглушить", "мут" };
 
     public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
-        var toMute = cmd.GetMember(args, 0, "ToMute");
+        var toMute = cmd.GetMember(args, 0);
         if (toMute is null) return;
 
         var duration = CommandProcessor.GetTimeSpan(args, 1);

Boyfriend/Commands/UnmuteCommand.cs

@@ -10,7 +10,7 @@ public sealed class UnmuteCommand : ICommand {
     public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
         if (!cmd.HasPermission(GuildPermission.ModerateMembers)) return;
 
-        var toUnmute = cmd.GetMember(args, 0, "ToUnmute");
+        var toUnmute = cmd.GetMember(args, 0);
         if (toUnmute is null) return;
         var reason = cmd.GetRemaining(args, 1, "UnmuteReason");
         if (reason is not null && cmd.CanInteractWith(toUnmute, "Unmute"))

Boyfriend/Messages.Designer.cs

@@ -626,15 +626,6 @@ namespace Boyfriend {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to You need to specify a setting to change!.
-        /// </summary>
-        internal static string MissingSetting {
-            get {
-                return ResourceManager.GetString("MissingSetting", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to You need to specify a reason to unban this user!.
         /// </summary>
@@ -698,24 +689,6 @@ namespace Boyfriend {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to I couldn&apos;t remove role {0} because of an error! {1}.
-        /// </summary>
-        internal static string RoleRemovalFailed {
-            get {
-                return ResourceManager.GetString("RoleRemovalFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Someone removed the mute role manually! I added back all roles that I removed during the mute.
-        /// </summary>
-        internal static string RolesReturned {
-            get {
-                return ResourceManager.GetString("RolesReturned", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to That setting doesn&apos;t exist!.
         /// </summary>

Boyfriend/Messages.resx

@@ -207,9 +207,6 @@
   <data name="MemberNotMuted" xml:space="preserve">
     <value>Member not muted!</value>
   </data>
-  <data name="RolesReturned" xml:space="preserve">
-    <value>Someone removed the mute role manually! I added back all roles that I removed during the mute</value>
-  </data>
     <data name="SettingsWelcomeMessage" xml:space="preserve">
     <value>Welcome message</value>
   </data>
@@ -234,9 +231,6 @@
   <data name="InvalidChannel" xml:space="preserve">
     <value>This channel does not exist!</value>
   </data>
-  <data name="RoleRemovalFailed" xml:space="preserve">
-    <value>I couldn't remove role {0} because of an error! {1}</value>
-  </data>
     <data name="DurationRequiredForTimeOuts" xml:space="preserve">
     <value>I cannot mute someone for more than 28 days using timeouts! Either specify a duration shorter than 28 days, or set a mute role in settings</value>
   </data>
@@ -381,9 +375,6 @@
   <data name="MissingUnmuteReason" xml:space="preserve">
     <value>You need to specify a reason for unmute this member!</value>
   </data>
-  <data name="MissingSetting" xml:space="preserve">
-    <value>You need to specify a setting to change!</value>
-  </data>
     <data name="UserCannotBanOwner" xml:space="preserve">
     <value>You cannot ban the owner of this guild!</value>
   </data>

Boyfriend/Messages.ru.resx

@@ -207,9 +207,6 @@
   <data name="MemberNotMuted" xml:space="preserve">
     <value>Участник не заглушен!</value>
   </data>
-  <data name="RolesReturned" xml:space="preserve">
-    <value>Кто-то убрал роль мута самостоятельно! Я вернул все роли, которые забрал при муте</value>
-  </data>
     <data name="SettingsWelcomeMessage" xml:space="preserve">
     <value>Приветствие</value>
   </data>
@@ -234,9 +231,6 @@
   <data name="InvalidChannel" xml:space="preserve">
     <value>Этот канал не существует!</value>
   </data>
-  <data name="RoleRemovalFailed" xml:space="preserve">
-    <value>Я не смог забрать роль {0} в связи с ошибкой! {1}</value>
-  </data>
     <data name="DurationRequiredForTimeOuts" xml:space="preserve">
     <value>Я не могу заглушить кого-то на более чем 28 дней, используя тайм-ауты! Или укажи продолжительность менее 28 дней, или установи роль мута в настройках</value>
   </data>
@@ -375,9 +369,6 @@
   <data name="MissingMuteReason" xml:space="preserve">
     <value>Надо указать причину для мута этого участника!</value>
   </data>
-  <data name="MissingSetting" xml:space="preserve">
-    <value>Надо указать настройку, которую нужно изменить!</value>
-  </data>
     <data name="MissingUnbanReason" xml:space="preserve">
     <value>Надо указать причину для разбана этого пользователя!</value>
   </data>

Boyfriend/Messages.tt-ru.resx

@@ -207,9 +207,6 @@
   <data name="MemberNotMuted" xml:space="preserve">
     <value>шизоид не замучен!</value>
   </data>
-  <data name="RolesReturned" xml:space="preserve">
-    <value>кто-то решил поумничать и обошел роль мута. я ее вернул.</value>
-  </data>
     <data name="SettingsWelcomeMessage" xml:space="preserve">
     <value>приветствие</value>
   </data>
@@ -234,9 +231,6 @@
   <data name="InvalidChannel" xml:space="preserve">
     <value>этого канала нету, ты шо</value>
   </data>
-  <data name="RoleRemovalFailed" xml:space="preserve">
-    <value>я не украл звание {0} в связи с ошибкой! {1}</value>
-  </data>
     <data name="DurationRequiredForTimeOuts" xml:space="preserve">
     <value>ты шо, мутить больше чем на 28 дней таймаут не разрешает, вот настроишь роль мута, тогда поговорим</value>
   </data>
@@ -375,9 +369,6 @@
   <data name="MissingMuteReason" xml:space="preserve">
     <value>укажи зачем мутить шизика</value>
   </data>
-  <data name="MissingSetting" xml:space="preserve">
-    <value>укажи настройку которую менять нужно</value>
-  </data>
     <data name="MissingUnbanReason" xml:space="preserve">
     <value>укажи зачем раззабанивать шизика</value>
   </data>

Boyfriend/Utils.cs

@@ -158,13 +158,6 @@ public static partial class Utils {
         return true;
     }
 
-    public static async Task ReturnRolesAsync(SocketGuildUser user, List<ulong> roles) {
-        // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
-        foreach (var role in roles)
-            if (role != user.Guild.Id)
-                await user.AddRoleAsync(role);
-    }
-
     [GeneratedRegex("[^0-9]")]
     private static partial Regex NumbersOnlyRegex();
 }