TeamInklings/OctobotStealth
TeamInklings/OctobotStealth
Archived
1
0
Fork 0
forked from TeamInklings/Octobot
Code Pull requests Wiki Activity Actions

Seal all possible classes, add LICENSE, follow async naming conventions

Browse source
This commit is contained in:
Octol1ttle 2022-09-18 19:41:29 +05:00
parent ac63719a0b
commit e767205c1a
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
20 changed files with 873 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Boyfriend/Commands/BanCommand.cs
View file

@ -3,11 +3,11 @@ using Discord.WebSocket;
namespace Boyfriend.Commands;
public class BanCommand : Command {
public override string[] Aliases { get; } = { "ban", "бан" };
public sealed class BanCommand : ICommand {
public string[] Aliases { get; } = { "ban", "бан" };
public override async Task Run(CommandProcessor cmd, string[] args) {
var toBan = cmd.GetUser(args, 0, "ToBan");
public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
var toBan = cmd.GetUser(args, cleanArgs, 0, "ToBan");
if (toBan == null || !cmd.HasPermission(GuildPermission.BanMembers)) return;
var memberToBan = cmd.GetMember(toBan, null);
@ -34,11 +34,7 @@ public class BanCommand : Command {
cmd.Reply(feedback, ":hammer: ");
cmd.Audit(feedback);
if (duration.TotalSeconds > 0) {
var _ = async () => {
await Task.Delay(duration);
await UnbanCommand.UnbanUser(cmd, toBan.Id, Messages.PunishmentExpired);
};
}
if (duration.TotalSeconds > 0)
await Task.FromResult(Utils.DelayedUnbanAsync(cmd, toBan.Id, Messages.PunishmentExpired, duration));
}
}
}

10
Boyfriend/Commands/ClearCommand.cs
View file

@ -3,15 +3,15 @@ using Discord.WebSocket;
namespace Boyfriend.Commands;
public class ClearCommand : Command {
public override string[] Aliases { get; } = { "clear", "purge", "очистить", "стереть" };
public sealed class ClearCommand : ICommand {
public string[] Aliases { get; } = { "clear", "purge", "очистить", "стереть" };
public override async Task Run(CommandProcessor cmd, string[] args) {
public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
if (cmd.Context.Channel is not SocketTextChannel channel) throw new Exception();
if (!cmd.HasPermission(GuildPermission.ManageMessages)) return;
var toDelete = cmd.GetNumberRange(args, 0, 1, 200, "ClearAmount");
var toDelete = cmd.GetNumberRange(cleanArgs, 0, 1, 200, "ClearAmount");
if (toDelete == null) return;
var messages = await channel.GetMessagesAsync((int)(toDelete + 1)).FlattenAsync();
@ -20,4 +20,4 @@ public class ClearCommand : Command {
cmd.Audit(string.Format(Messages.FeedbackMessagesCleared, (toDelete + 1).ToString()));
}
}
}

7
Boyfriend/Commands/Command.cs
View file

@ -1,7 +0,0 @@
namespace Boyfriend.Commands;
public abstract class Command {
public abstract string[] Aliases { get; }
public abstract Task Run(CommandProcessor cmd, string[] args);
}

8
Boyfriend/Commands/HelpCommand.cs
View file

@ -2,10 +2,10 @@
namespace Boyfriend.Commands;
public class HelpCommand : Command {
public override string[] Aliases { get; } = { "help", "помощь", "справка" };
public sealed class HelpCommand : ICommand {
public string[] Aliases { get; } = { "help", "помощь", "справка" };
public override Task Run(CommandProcessor cmd, string[] args) {
public Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
var prefix = Boyfriend.GetGuildConfig(cmd.Context.Guild.Id)["Prefix"];
var toSend = Boyfriend.StringBuilder.Append(Messages.CommandHelp);
@ -17,4 +17,4 @@ public class HelpCommand : Command {
return Task.CompletedTask;
}
}
}

7
Boyfriend/Commands/ICommand.cs Normal file
View file

@ -0,0 +1,7 @@
namespace Boyfriend.Commands;
public interface ICommand {
public string[] Aliases { get; }
public Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs);
}

14
Boyfriend/Commands/KickCommand.cs
View file

@ -3,19 +3,19 @@ using Discord.WebSocket;
namespace Boyfriend.Commands;
public class KickCommand : Command {
public override string[] Aliases { get; } = { "kick", "кик", "выгнать" };
public sealed class KickCommand : ICommand {
public string[] Aliases { get; } = { "kick", "кик", "выгнать" };
public override async Task Run(CommandProcessor cmd, string[] args) {
var toKick = cmd.GetMember(args, 0, "ToKick");
public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
var toKick = cmd.GetMember(args, cleanArgs, 0, "ToKick");
if (toKick == null || !cmd.HasPermission(GuildPermission.KickMembers)) return;
if (!cmd.CanInteractWith(toKick, "Kick")) return;
await KickMember(cmd, toKick, cmd.GetRemaining(args, 1, "KickReason"));
await KickMemberAsync(cmd, toKick, cmd.GetRemaining(args, 1, "KickReason"));
}
private static async Task KickMember(CommandProcessor cmd, SocketGuildUser toKick, string? reason) {
private static async Task KickMemberAsync(CommandProcessor cmd, SocketGuildUser toKick, string? reason) {
if (reason == null) return;
var guildKickMessage = $"({cmd.Context.User}) {reason}";
@ -28,4 +28,4 @@ public class KickCommand : Command {
cmd.Reply(format, ":police_car: ");
cmd.Audit(format);
}
}
}

35
Boyfriend/Commands/MuteCommand.cs
View file

@ -4,11 +4,11 @@ using Discord.WebSocket;
namespace Boyfriend.Commands;
public class MuteCommand : Command {
public override string[] Aliases { get; } = { "mute", "timeout", "заглушить", "мут" };
public sealed class MuteCommand : ICommand {
public string[] Aliases { get; } = { "mute", "timeout", "заглушить", "мут" };
public override async Task Run(CommandProcessor cmd, string[] args) {
var toMute = cmd.GetMember(args, 0, "ToMute");
public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
var toMute = cmd.GetMember(args, cleanArgs, 0, "ToMute");
if (toMute == null) return;
var duration = CommandProcessor.GetTimeSpan(args, 1);
@ -16,13 +16,12 @@ public class MuteCommand : Command {
if (reason == null) return;
var role = Utils.GetMuteRole(cmd.Context.Guild);
if (role != null) {
if (toMute.Roles.Contains(role) || (toMute.TimedOutUntil != null &&
toMute.TimedOutUntil.Value.ToUnixTimeMilliseconds() >
DateTimeOffset.Now.ToUnixTimeMilliseconds())) {
cmd.Reply(Messages.MemberAlreadyMuted, ":x: ");
return;
}
if ((role != null && toMute.Roles.Contains(role))
|| (toMute.TimedOutUntil != null
&& toMute.TimedOutUntil.Value.ToUnixTimeSeconds()
> DateTimeOffset.Now.ToUnixTimeSeconds())) {
cmd.Reply(Messages.MemberAlreadyMuted, ":x: ");
return;
}
var rolesRemoved = Boyfriend.GetRemovedRoles(cmd.Context.Guild.Id);
@ -36,10 +35,10 @@ public class MuteCommand : Command {
if (!cmd.HasPermission(GuildPermission.ModerateMembers) || !cmd.CanInteractWith(toMute, "Mute")) return;
await MuteMember(cmd, toMute, duration, reason);
await MuteMemberAsync(cmd, toMute, duration, reason);
}
private static async Task MuteMember(CommandProcessor cmd, SocketGuildUser toMute,
private static async Task MuteMemberAsync(CommandProcessor cmd, SocketGuildUser toMute,
TimeSpan duration, string reason) {
var guild = cmd.Context.Guild;
var config = Boyfriend.GetGuildConfig(guild.Id);
@ -66,12 +65,8 @@ public class MuteCommand : Command {
await toMute.AddRoleAsync(role, requestOptions);
if (hasDuration) {
var _ = async () => {
await Task.Delay(duration);
await UnmuteCommand.UnmuteMember(cmd, toMute, Messages.PunishmentExpired);
};
}
if (hasDuration)
await Task.FromResult(Utils.DelayedUnmuteAsync(cmd, toMute, Messages.PunishmentExpired, duration));
} else {
if (!hasDuration || duration.TotalDays > 28) {
cmd.Reply(Messages.DurationRequiredForTimeOuts, ":x: ");
@ -92,4 +87,4 @@ public class MuteCommand : Command {
cmd.Reply(feedback, ":mute: ");
cmd.Audit(feedback);
}
}
}

8
Boyfriend/Commands/PingCommand.cs
View file

@ -1,9 +1,9 @@
namespace Boyfriend.Commands;
public class PingCommand : Command {
public override string[] Aliases { get; } = { "ping", "latency", "pong", "пинг", "задержка", "понг" };
public sealed class PingCommand : ICommand {
public string[] Aliases { get; } = { "ping", "latency", "pong", "пинг", "задержка", "понг" };
public override Task Run(CommandProcessor cmd, string[] args) {
public Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
var builder = Boyfriend.StringBuilder;
builder.Append(Utils.GetBeep())
@ -15,4 +15,4 @@ public class PingCommand : Command {
return Task.CompletedTask;
}
}
}

9
Boyfriend/Commands/SelfBanCommand.cs Normal file
View file

@ -0,0 +1,9 @@
namespace Boyfriend.Commands;
public sealed class SelfBanCommand : ICommand {
public string[] Aliases { get; } = { "grantoverseer", "grant", "overseer", "voooo", "overseergrant", "special" };
public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
await BanCommand.BanUser(cmd, cmd.Context.User, TimeSpan.FromMilliseconds(-1), "");
}
}

10
Boyfriend/Commands/SettingsCommand.cs
View file

@ -2,10 +2,10 @@
namespace Boyfriend.Commands;
public class SettingsCommand : Command {
public override string[] Aliases { get; } = { "settings", "config", "настройки", "конфиг" };
public sealed class SettingsCommand : ICommand {
public string[] Aliases { get; } = { "settings", "config", "настройки", "конфиг" };
public override Task Run(CommandProcessor cmd, string[] args) {
public Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
if (!cmd.HasPermission(GuildPermission.ManageGuild)) return Task.CompletedTask;
var guild = cmd.Context.Guild;
@ -48,7 +48,7 @@ public class SettingsCommand : Command {
var exists = false;
// ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
// The performance impact is not worth it
// Too many allocations
foreach (var setting in Boyfriend.DefaultConfig.Keys) {
if (selectedSetting != setting.ToLower()) continue;
selectedSetting = setting;
@ -161,4 +161,4 @@ public class SettingsCommand : Command {
private static bool IsBool(string value) {
return value is "true" or "false";
}
}
}

12
Boyfriend/Commands/UnbanCommand.cs
View file

@ -2,10 +2,10 @@
namespace Boyfriend.Commands;
public class UnbanCommand : Command {
public override string[] Aliases { get; } = { "unban", "разбан" };
public sealed class UnbanCommand : ICommand {
public string[] Aliases { get; } = { "unban", "разбан" };
public override async Task Run(CommandProcessor cmd, string[] args) {
public async Task RunAsync(CommandProcessor cmd, string[] args, string[] cleanArgs) {
if (!cmd.HasPermission(GuildPermission.BanMembers)) return;
var id = cmd.GetBan(args, 0);
@ -13,10 +13,10 @@ public class UnbanCommand : Command {
var reason = cmd.GetRemaining(args, 1, "UnbanReason");
if (reason == null) return;
await UnbanUser(cmd, id.Value, reason);
await UnbanUserAsync(cmd, id.Value, reason);
}
public static async Task UnbanUser(CommandProcessor cmd, ulong id, string reason) {
public static async Task UnbanUserAsync(CommandProcessor cmd, ulong id, string reason) {
var requestOptions = Utils.GetRequestOptions($"({cmd.Context.User}) {reason}");
await cmd.Context.Guild.RemoveBanAsync(id, requestOptions);
@ -24,4 +24,4 @@ public class UnbanCommand : Command {
cmd.Reply(feedback);
cmd.Audit(feedback);
}
}
}

18
Boyfriend/Commands/UnmuteCommand.cs
View file

@ -3,19 +3,19 @@ using Discord.WebSocket;
namespace Boyfriend.Commands;
public class UnmuteCommand : Command {
public override string[] Aliases { get; } = { "unmute", "размут" };
public sealed class UnmuteCommand : ICommand {
public string[] Aliases { get; } = { "unmute", "размут" };
public override async Task Run(CommandProcessor cmd, string[] args) {
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, cleanArgs, 0, "ToUnmute");
var reason = cmd.GetRemaining(args, 1, "UnmuteReason");
if (toUnmute == null || reason == null || !cmd.CanInteractWith(toUnmute, "Unmute")) return;
await UnmuteMember(cmd, toUnmute, reason);
await UnmuteMemberAsync(cmd, toUnmute, reason);
}
public static async Task UnmuteMember(CommandProcessor cmd, SocketGuildUser toUnmute,
public static async Task UnmuteMemberAsync(CommandProcessor cmd, SocketGuildUser toUnmute,
string reason) {
var requestOptions = Utils.GetRequestOptions($"({cmd.Context.User}) {reason}");
var role = Utils.GetMuteRole(cmd.Context.Guild);
@ -31,8 +31,8 @@ public class UnmuteCommand : Command {
await toUnmute.RemoveRoleAsync(role, requestOptions);
} else {
if (toUnmute.TimedOutUntil == null || toUnmute.TimedOutUntil.Value.ToUnixTimeMilliseconds() <
DateTimeOffset.Now.ToUnixTimeMilliseconds()) {
if (toUnmute.TimedOutUntil == null || toUnmute.TimedOutUntil.Value.ToUnixTimeSeconds() <
DateTimeOffset.Now.ToUnixTimeSeconds()) {
cmd.Reply(Messages.MemberNotMuted, ":x: ");
return;
}
@ -44,4 +44,4 @@ public class UnmuteCommand : Command {
cmd.Reply(feedback, ":loud_sound: ");
cmd.Audit(feedback);
}
}
}