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

every single file changed lulw

Browse source
This commit is contained in:
l1ttleO 2022-01-30 13:43:15 +05:00
parent f30485dd71
commit 4d838e5af3
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
14 changed files with 825 additions and 511 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Boyfriend/Boyfriend.cs
View file

@ -1,5 +1,5 @@
using System.Globalization;
using System.Text.Json;
using Newtonsoft.Json;
using Discord;
using Discord.WebSocket;
@ -26,7 +26,7 @@ public static class Boyfriend {
await Client.LoginAsync(TokenType.Bot, token);
await Client.StartAsync();
await Client.SetActivityAsync(new Game("Retrospecter - Chiller", ActivityType.Listening));
await Client.SetActivityAsync(new Game("Retrospecter - Expurgation", ActivityType.Listening));
new EventHandler().InitEvents();
@ -41,27 +41,33 @@ public static class Boyfriend {
public static async Task SetupGuildConfigs() {
foreach (var guild in Client.Guilds) {
var path = "config_" + guild.Id + ".json";
var openStream = !File.Exists(path) ? File.Create(path) : File.OpenRead(path);
if (!File.Exists(path)) File.Create(path);
GuildConfig config;
try {
config = await JsonSerializer.DeserializeAsync<GuildConfig>(openStream) ?? throw new Exception();
} catch (JsonException) {
var config = JsonConvert.DeserializeObject<GuildConfig>(await File.ReadAllTextAsync(path));
if (config == null) {
Messages.Culture = new CultureInfo("ru");
config = new GuildConfig(guild.Id, "ru", "!", false, true,
true, Messages.DefaultWelcomeMessage, 0, 0, 0, 0);
config = new GuildConfig(guild.Id);
}
config.Validate();
GuildConfigDictionary.Add(config.Id.GetValueOrDefault(0), config);
}
}
public static void ResetGuildConfig(IGuild guild) {
GuildConfigDictionary.Remove(guild.Id);
var config = new GuildConfig(guild.Id);
config.Validate();
GuildConfigDictionary.Add(guild.Id, config);
}
}
public static GuildConfig GetGuildConfig(IGuild guild) {
Messages.Culture = new CultureInfo("ru");
var toReturn = GuildConfigDictionary.ContainsKey(guild.Id) ? GuildConfigDictionary[guild.Id]
: new GuildConfig(guild.Id, "ru", "!", false, true, true, Messages.DefaultWelcomeMessage, 0, 0, 0, 0);
var config = GuildConfigDictionary.ContainsKey(guild.Id) ? GuildConfigDictionary[guild.Id] :
new GuildConfig(guild.Id);
config.Validate();
if (toReturn.Id != guild.Id) throw new Exception();
return toReturn;
return config;
}
public static IGuild FindGuild(IMessageChannel channel) {

3
Boyfriend/Boyfriend.csproj
View file

@ -15,7 +15,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Discord.Net" Version="3.1.0"/>
<PackageReference Include="Discord.Net" Version="3.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>

6
Boyfriend/CommandHandler.cs
View file

@ -9,14 +9,15 @@ namespace Boyfriend;
public static class CommandHandler {
public static readonly Command[] Commands = {
new BanCommand(), new ClearCommand(), new HelpCommand(),
new KickCommand(), new MuteCommand()
new KickCommand(), new MuteCommand(), new PingCommand(),
new SettingsCommand(), new UnbanCommand(), new UnmuteCommand()
};
public static async Task HandleCommand(SocketUserMessage message) {
var context = new SocketCommandContext(Boyfriend.Client, message);
foreach (var command in Commands) {
var regex = new Regex(Regex.Escape(Boyfriend.GetGuildConfig(context.Guild).Prefix));
var regex = new Regex(Regex.Escape(Boyfriend.GetGuildConfig(context.Guild).Prefix!));
if (!command.GetAliases().Contains(regex.Replace(message.Content, "", 1).Split()[0])) continue;
var args = message.Content.Split().Skip(1).ToArray();
@ -35,6 +36,7 @@ public static class CommandHandler {
await context.Channel.SendMessageAsync($"{signature} `{e.Message}`");
if (e.StackTrace != null && e is not ApplicationException or UnauthorizedAccessException)
await context.Channel.SendMessageAsync(Utils.Wrap(e.StackTrace));
throw;
}
break;

10
Boyfriend/Commands/MuteCommand.cs
View file

@ -28,15 +28,17 @@ public class MuteCommand : Command {
toMute.TimedOutUntil != null && toMute.TimedOutUntil.Value.ToUnixTimeMilliseconds()
> DateTimeOffset.Now.ToUnixTimeMilliseconds())
throw new ApplicationException(Messages.MemberAlreadyMuted);
var rolesRemoved = Boyfriend.GetGuildConfig(context.Guild).RolesRemovedOnMute;
var config = Boyfriend.GetGuildConfig(context.Guild);
var rolesRemoved = config.RolesRemovedOnMute!;
if (rolesRemoved.ContainsKey(toMute.Id)) {
foreach (var roleId in rolesRemoved[toMute.Id]) await toMute.AddRoleAsync(roleId);
rolesRemoved.Remove(toMute.Id);
await config.Save();
await Warn(context.Channel, Messages.RolesReturned);
return;
}
await CommandHandler.CheckPermissions(author, GuildPermission.ManageMessages, GuildPermission.ManageRoles);
await CommandHandler.CheckPermissions(author, GuildPermission.ModerateMembers, GuildPermission.ManageRoles);
await CommandHandler.CheckInteractions(author, toMute);
MuteMember(context.Guild, context.Channel as ITextChannel, context.Guild.GetUser(context.User.Id), toMute,
duration, reason);
@ -48,7 +50,7 @@ public class MuteCommand : Command {
var authorMention = author.Mention;
var role = Utils.GetMuteRole(guild);
var config = Boyfriend.GetGuildConfig(guild);
if (config.RemoveRolesOnMute && role != null) {
if (config.RemoveRolesOnMute.GetValueOrDefault(false) && role != null) {
var rolesRemoved = new List<ulong>();
try {
foreach (var roleId in toMute.RoleIds) {
@ -59,7 +61,7 @@ public class MuteCommand : Command {
}
catch (NullReferenceException) { }
config.RolesRemovedOnMute.Add(toMute.Id, rolesRemoved);
config.RolesRemovedOnMute!.Add(toMute.Id, rolesRemoved);
await config.Save();
}

2
Boyfriend/Commands/PingCommand.cs
View file

@ -7,7 +7,7 @@ namespace Boyfriend.Commands;
public class PingCommand : Command {
public override async Task Run(SocketCommandContext context, string[] args) {
await context.Channel.SendMessageAsync($"{Utils.GetBeep(Boyfriend.GetGuildConfig(context.Guild).Lang)}" +
await context.Channel.SendMessageAsync($"{Utils.GetBeep(Boyfriend.GetGuildConfig(context.Guild).Lang!)}" +
$"{Boyfriend.Client.Latency}{Messages.Milliseconds}");
}

75
Boyfriend/Commands/SettingsCommand.cs
View file

@ -14,71 +14,89 @@ public class SettingsCommand : Command {
var guild = context.Guild;
if (args.Length == 0) {
var nl = Environment.NewLine;
var adminLogChannel = guild.GetTextChannel(config.AdminLogChannel);
var adminLogChannel = guild.GetTextChannel(config.AdminLogChannel.GetValueOrDefault(0));
var admin = adminLogChannel == null ? Messages.ChannelNotSpecified : adminLogChannel.Mention;
var botLogChannel = guild.GetTextChannel(config.BotLogChannel);
var botLogChannel = guild.GetTextChannel(config.BotLogChannel.GetValueOrDefault(0));
var bot = botLogChannel == null ? Messages.ChannelNotSpecified : botLogChannel.Mention;
var muteRole = guild.GetRole(config.MuteRole);
var muteRole = guild.GetRole(config.MuteRole.GetValueOrDefault(0));
var mute = muteRole == null ? Messages.RoleNotSpecified : muteRole.Mention;
var defaultRole = guild.GetRole(config.DefaultRole);
var defaultr = muteRole == null ? Messages.RoleNotSpecified : defaultRole.Mention;
var defaultRole = guild.GetRole(config.DefaultRole.GetValueOrDefault(0));
var defaultr = defaultRole == null ? Messages.RoleNotSpecified : defaultRole.Mention;
var toSend = string.Format(Messages.CurrentSettings, nl) +
string.Format(Messages.CurrentSettingsLang, config.Lang, nl) +
string.Format(Messages.CurrentSettingsPrefix, config.Prefix, nl) +
string.Format(Messages.CurrentSettingsRemoveRoles, YesOrNo(config.RemoveRolesOnMute), nl) +
string.Format(Messages.CurrentSettingsUseSystemChannel, YesOrNo(config.UseSystemChannel), nl) +
string.Format(Messages.CurrentSettingsSendWelcomeMessages, YesOrNo(config.UseSystemChannel),
nl) +
string.Format(Messages.CurrentSettingsRemoveRoles, YesOrNo(
config.RemoveRolesOnMute.GetValueOrDefault(false)), nl) +
string.Format(Messages.CurrentSettingsUseSystemChannel, YesOrNo(
config.UseSystemChannel.GetValueOrDefault(true)), nl) +
string.Format(Messages.CurrentSettingsSendWelcomeMessages, YesOrNo(
config.SendWelcomeMessages.GetValueOrDefault(true)), nl) +
string.Format(Messages.CurrentSettingsReceiveStartupMessages, YesOrNo(
config.ReceiveStartupMessages.GetValueOrDefault(true)), nl) +
string.Format(Messages.CurrentSettingsWelcomeMessage, config.WelcomeMessage, nl) +
string.Format(Messages.CurrentSettingsDefaultRole, defaultr, nl) +
string.Format(Messages.CurrentSettingsMuteRole, mute, nl) +
string.Format(Messages.CurrentSettingsAdminLogChannel, admin, nl) +
string.Format(Messages.CurrentSettingsBotLogChannel, bot);
await Utils.SilentSendAsync(context.Channel as ITextChannel ?? throw new Exception(), toSend);
await Utils.SilentSendAsync(context.Channel as ITextChannel ?? throw new ApplicationException(), toSend);
return;
}
var setting = args[0].ToLower();
var value = args[1].ToLower();
var value = "";
var shouldDefault = false;
if (args.Length >= 2)
value = args[1].ToLower();
else
shouldDefault = true;
var boolValue = ParseBool(args[1]);
var boolValue = ParseBool(value);
var channel = await Utils.ParseChannelNullable(value) as IGuildChannel;
var role = Utils.ParseRoleNullable(guild, value);
switch (setting) {
case "reset":
Boyfriend.ResetGuildConfig(guild);
break;
case "lang" when value is not ("ru" or "en"):
throw new Exception(Messages.LanguageNotSupported);
throw new ApplicationException(Messages.LanguageNotSupported);
case "lang":
config.Lang = value;
Messages.Culture = new CultureInfo(value);
config.Lang = shouldDefault ? "ru" : value;
Messages.Culture = new CultureInfo(shouldDefault ? "ru" : value);
break;
case "prefix":
config.Prefix = value;
config.Prefix = shouldDefault ? "!" : value;
break;
case "removerolesonmute":
config.RemoveRolesOnMute = GetBoolValue(boolValue);
config.RemoveRolesOnMute = !shouldDefault && GetBoolValue(boolValue);
break;
case "usesystemchannel":
config.UseSystemChannel = GetBoolValue(boolValue);
config.UseSystemChannel = shouldDefault || GetBoolValue(boolValue);
break;
case "sendwelcomemessages":
config.SendWelcomeMessages = GetBoolValue(boolValue);
config.SendWelcomeMessages = shouldDefault || GetBoolValue(boolValue);
break;
case "receivestartupmessages":
config.ReceiveStartupMessages = shouldDefault || GetBoolValue(boolValue);
break;
case "welcomemessage":
config.WelcomeMessage = value;
config.WelcomeMessage = shouldDefault ? Messages.DefaultWelcomeMessage : value;
break;
case "defaultrole":
config.DefaultRole = GetRoleId(role);
config.DefaultRole = shouldDefault ? 0 : GetRoleId(role);
break;
case "muterole":
config.MuteRole = GetRoleId(role);
config.MuteRole = shouldDefault ? 0 : GetRoleId(role);
break;
case "adminlogchannel":
config.AdminLogChannel = GetChannelId(channel);
config.AdminLogChannel = shouldDefault ? 0 : GetChannelId(channel);
break;
case "botlogchannel":
config.BotLogChannel = GetChannelId(channel);
config.BotLogChannel = shouldDefault ? 0 : GetChannelId(channel);
break;
default:
await context.Channel.SendMessageAsync(Messages.SettingDoesntExist);
return;
}
await config.Save();
@ -89,22 +107,21 @@ public class SettingsCommand : Command {
private static bool? ParseBool(string toParse) {
try {
return bool.Parse(toParse.ToLower());
}
catch (FormatException) {
} catch (FormatException) {
return null;
}
}
private static bool GetBoolValue(bool? from) {
return from ?? throw new Exception(Messages.InvalidBoolean);
return from ?? throw new ApplicationException(Messages.InvalidBoolean);
}
private static ulong GetRoleId(IRole? role) {
return (role ?? throw new Exception(Messages.InvalidRoleSpecified)).Id;
return (role ?? throw new ApplicationException(Messages.InvalidRoleSpecified)).Id;
}
private static ulong GetChannelId(IGuildChannel? channel) {
return (channel ?? throw new Exception(Messages.InvalidChannelSpecified)).Id;
return (channel ?? throw new ApplicationException(Messages.InvalidChannelSpecified)).Id;
}
private static string YesOrNo(bool isYes) {

2
Boyfriend/Commands/UnbanCommand.cs
View file

@ -11,7 +11,7 @@ public class UnbanCommand : Command {
public override async Task Run(SocketCommandContext context, string[] args) {
var toUnban = await Utils.ParseUser(args[0]);
if (context.Guild.GetBanAsync(toUnban.Id) == null)
throw new Exception(Messages.UserNotBanned);
throw new ApplicationException(Messages.UserNotBanned);
UnbanUser(context.Guild, context.Channel as ITextChannel, context.Guild.GetUser(context.User.Id), toUnban,
Utils.JoinString(args, 1));
}

24
Boyfriend/Commands/UnmuteCommand.cs
View file

@ -14,14 +14,21 @@ public class UnmuteCommand : Command {
await CommandHandler.CheckPermissions(author, GuildPermission.ManageMessages, GuildPermission.ManageRoles);
await CommandHandler.CheckInteractions(author, toUnmute);
var role = Utils.GetMuteRole(context.Guild);
if (role != null)
if (role != null) {
if (toUnmute.RoleIds.All(x => x != role.Id)) {
var rolesRemoved = Boyfriend.GetGuildConfig(context.Guild).RolesRemovedOnMute;
var config = Boyfriend.GetGuildConfig(context.Guild);
var rolesRemoved = config.RolesRemovedOnMute;
foreach (var roleId in rolesRemoved[toUnmute.Id]) await toUnmute.AddRoleAsync(roleId);
foreach (var roleId in rolesRemoved![toUnmute.Id]) await toUnmute.AddRoleAsync(roleId);
rolesRemoved.Remove(toUnmute.Id);
await config.Save();
throw new ApplicationException(Messages.RolesReturned);
}
}
if (role != null && toUnmute.RoleIds.All(x => x != role.Id) ||
toUnmute.TimedOutUntil == null || toUnmute.TimedOutUntil.Value.ToUnixTimeMilliseconds()
< DateTimeOffset.Now.ToUnixTimeMilliseconds())
throw new ApplicationException(Messages.MemberNotMuted);
UnmuteMember(context.Guild, context.Channel as ITextChannel, context.Guild.GetUser(context.User.Id),
toUnmute, Utils.JoinString(args, 1));
@ -33,12 +40,19 @@ public class UnmuteCommand : Command {
var authorMention = author.Mention;
var notification = string.Format(Messages.MemberUnmuted, authorMention, toUnmute.Mention,
Utils.WrapInline(reason));
await toUnmute.RemoveRoleAsync(Utils.GetMuteRole(guild));
var role = Utils.GetMuteRole(guild);
if (role != null) {
await toUnmute.RemoveRoleAsync(role);
var config = Boyfriend.GetGuildConfig(guild);
if (config.RolesRemovedOnMute.ContainsKey(toUnmute.Id)) {
if (config.RolesRemovedOnMute!.ContainsKey(toUnmute.Id)) {
foreach (var roleId in config.RolesRemovedOnMute[toUnmute.Id]) await toUnmute.AddRoleAsync(roleId);
config.RolesRemovedOnMute.Remove(toUnmute.Id);
await config.Save();
}
} else {
await toUnmute.RemoveTimeOutAsync();
}
await Utils.SilentSendAsync(channel, string.Format(Messages.UnmuteResponse, toUnmute.Mention,

18
Boyfriend/EventHandler.cs
View file

@ -23,10 +23,10 @@ public class EventHandler {
var i = new Random().Next(3);
foreach (var guild in Boyfriend.Client.Guilds) {
var config = Boyfriend.GetGuildConfig(guild);
Messages.Culture = new CultureInfo(config.Lang);
var channel = guild.GetTextChannel(config.BotLogChannel);
if (channel == null) continue;
await channel.SendMessageAsync(string.Format(Messages.Ready, Utils.GetBeep(config.Lang, i)));
Messages.Culture = new CultureInfo(config.Lang!);
var channel = guild.GetTextChannel(config.BotLogChannel.GetValueOrDefault(0));
if (!config.ReceiveStartupMessages.GetValueOrDefault(true) || channel == null) continue;
await channel.SendMessageAsync(string.Format(Messages.Ready, Utils.GetBeep(config.Lang!, i)));
}
}
@ -48,7 +48,7 @@ public class EventHandler {
var argPos = 0;
var guildConfig = Boyfriend.GetGuildConfig(guild);
Messages.Culture = new CultureInfo(guildConfig.Lang);
Messages.Culture = new CultureInfo(guildConfig.Lang!);
if ((message.MentionedUsers.Count > 3 || message.MentionedRoles.Count > 2)
&& !user.GuildPermissions.MentionEveryone)
await BanCommand.BanUser(guild, null, await guild.GetCurrentUserAsync(), user,
@ -67,7 +67,7 @@ public class EventHandler {
if (!(message.HasStringPrefix(guildConfig.Prefix, ref argPos)
|| message.HasMentionPrefix(Boyfriend.Client.CurrentUser, ref argPos))
|| user == await guild.GetCurrentUserAsync()
|| user.IsBot && message.Content.Contains(prev) || message.Content.Contains(prevFailsafe))
|| user.IsBot && (message.Content.Contains(prev) || message.Content.Contains(prevFailsafe)))
return;
await CommandHandler.HandleCommand(message);
@ -91,10 +91,10 @@ public class EventHandler {
private static async Task UserJoinedEvent(SocketGuildUser user) {
var guild = user.Guild;
var config = Boyfriend.GetGuildConfig(guild);
if (config.SendWelcomeMessages)
await Utils.SilentSendAsync(guild.SystemChannel, string.Format(config.WelcomeMessage, user.Mention,
if (config.SendWelcomeMessages.GetValueOrDefault(true))
await Utils.SilentSendAsync(guild.SystemChannel, string.Format(config.WelcomeMessage!, user.Mention,
guild.Name));
if (config.DefaultRole != 0)
await user.AddRoleAsync(Utils.ParseRole(guild, config.DefaultRole.ToString()));
await user.AddRoleAsync(Utils.ParseRole(guild, config.DefaultRole.ToString()!));
}
}

66
Boyfriend/GuildConfig.cs
View file

@ -1,40 +1,48 @@
using System.Text.Json;
using System.Globalization;
using Newtonsoft.Json;
namespace Boyfriend;
public class GuildConfig {
public ulong Id { get; }
public string Lang { get; set; }
public string Prefix { get; set; }
public bool RemoveRolesOnMute { get; set; }
public bool UseSystemChannel { get; set; }
public bool SendWelcomeMessages { get; set; }
public string WelcomeMessage { get; set; }
public ulong DefaultRole { get; set; }
public ulong MuteRole { get; set; }
public ulong AdminLogChannel { get; set; }
public ulong BotLogChannel { get; set; }
public Dictionary<ulong, List<ulong>> RolesRemovedOnMute { get; set; }
public ulong? Id { get; }
public string? Lang { get; set; }
public string? Prefix { get; set; }
public bool? RemoveRolesOnMute { get; set; }
public bool? UseSystemChannel { get; set; }
public bool? SendWelcomeMessages { get; set; }
public bool? ReceiveStartupMessages { get; set; }
public string? WelcomeMessage { get; set; }
public ulong? DefaultRole { get; set; }
public ulong? MuteRole { get; set; }
public ulong? AdminLogChannel { get; set; }
public ulong? BotLogChannel { get; set; }
public Dictionary<ulong, List<ulong>>? RolesRemovedOnMute { get; private set; }
public GuildConfig(ulong id, string lang, string prefix, bool removeRolesOnMute, bool useSystemChannel,
bool sendWelcomeMessages, string welcomeMessage, ulong defaultRole, ulong muteRole, ulong adminLogChannel,
ulong botLogChannel) {
public GuildConfig(ulong id) {
Id = id;
Lang = lang;
Prefix = prefix;
RemoveRolesOnMute = removeRolesOnMute;
UseSystemChannel = useSystemChannel;
SendWelcomeMessages = sendWelcomeMessages;
WelcomeMessage = welcomeMessage;
DefaultRole = defaultRole;
MuteRole = muteRole;
AdminLogChannel = adminLogChannel;
BotLogChannel = botLogChannel;
RolesRemovedOnMute = new Dictionary<ulong, List<ulong>>();
Validate();
}
public void Validate() {
if (Id == null) throw new Exception("Something went horribly, horribly wrong");
Lang ??= "ru";
Messages.Culture = new CultureInfo(Lang);
Prefix ??= "!";
RemoveRolesOnMute ??= false;
UseSystemChannel ??= true;
SendWelcomeMessages ??= true;
ReceiveStartupMessages ??= true;
WelcomeMessage ??= Messages.DefaultWelcomeMessage;
DefaultRole ??= 0;
MuteRole ??= 0;
AdminLogChannel ??= 0;
BotLogChannel ??= 0;
RolesRemovedOnMute ??= new Dictionary<ulong, List<ulong>>();
}
public async Task Save() {
await using var stream = File.OpenWrite("config_" + Id + ".json");
await JsonSerializer.SerializeAsync(stream, this);
Validate();
RolesRemovedOnMute!.TrimExcess();
await File.WriteAllTextAsync("config_" + Id + ".json", JsonConvert.SerializeObject(this));
}
}

1056
Boyfriend/Messages.Designer.cs generated
View file

File diff suppressed because it is too large Load diff

6
Boyfriend/Messages.resx
View file

@ -243,4 +243,10 @@
<data name="UnmuteResponse" xml:space="preserve">
<value>:white_check_mark: Successfully unmuted {0} for {1}</value>
</data>
<data name="SettingDoesntExist" xml:space="preserve">
<value>That setting doesn't exist!</value>
</data>
<data name="CurrentSettingsReceiveStartupMessages" xml:space="preserve">
<value>Receive startup messages (`receiveStartupMessages`): {0}{1}</value>
</data>
</root>

6
Boyfriend/Messages.ru.resx
View file

@ -234,4 +234,10 @@
<data name="UnmuteResponse" xml:space="preserve">
<value>:white_check_mark: Успешно возвращён из мута {0} за {1}</value>
</data>
<data name="SettingDoesntExist" xml:space="preserve">
<value>Такая настройка не существует!</value>
</data>
<data name="CurrentSettingsReceiveStartupMessages" xml:space="preserve">
<value>Получать сообщения о запуске (`receiveStartupMessages`): {0}{1}</value>
</data>
</root>

2
Boyfriend/Utils.cs
View file

@ -21,7 +21,7 @@ public static class Utils {
}
public static async Task<ITextChannel?> GetAdminLogChannel(IGuild guild) {
var adminLogChannel = await ParseChannelNullable(Boyfriend.GetGuildConfig(guild).AdminLogChannel.ToString());
var adminLogChannel = await ParseChannelNullable(Boyfriend.GetGuildConfig(guild).AdminLogChannel.ToString()!);
return adminLogChannel as ITextChannel;
}