TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-30 02:59:54 +03:00
Code Issues Wiki Activity

time-out failsafes and new warnings

Browse source 
rewrote setting values in SettingsCommand.cs
fixed a bug with message edited notification on mobile
fixed an exploit with WrapInline where you could escape the code block by simply using `
moved a few things in MuteCommand.cs
cleaned up code
updated library to 3.3.2
This commit is contained in:
l1ttleO 2022-02-21 22:08:55 +05:00
parent e41a459f6f
commit 868b6bcaa7
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
12 changed files with 220 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

150
Boyfriend/Commands/SettingsCommand.cs
View file

@ -1,4 +1,4 @@
using System.Globalization;
using System.Reflection;
using Discord;
using Discord.Commands;
@ -16,117 +16,83 @@ public class SettingsCommand : Command {
if (args.Length == 0) {
var nl = Environment.NewLine;
var adminLogChannel = guild.GetTextChannel(config.AdminLogChannel.GetValueOrDefault(0));
var admin = adminLogChannel == null ? Messages.ChannelNotSpecified : adminLogChannel.Mention;
var botLogChannel = guild.GetTextChannel(config.BotLogChannel.GetValueOrDefault(0));
var bot = botLogChannel == null ? Messages.ChannelNotSpecified : botLogChannel.Mention;
var muteRole = guild.GetRole(config.MuteRole.GetValueOrDefault(0));
var mute = muteRole == null ? Messages.RoleNotSpecified : muteRole.Mention;
var defaultRole = guild.GetRole(config.DefaultRole.GetValueOrDefault(0));
var defaultr = defaultRole == null ? Messages.RoleNotSpecified : defaultRole.Mention;
dynamic forCheck;
var adminLogChannel = (forCheck = guild.GetTextChannel(config.AdminLogChannel.GetValueOrDefault(0))) == null
? Messages.ChannelNotSpecified : forCheck.Mention;
var botLogChannel = (forCheck = guild.GetTextChannel(config.BotLogChannel.GetValueOrDefault(0))) == null
? Messages.ChannelNotSpecified : forCheck.Mention;
var muteRole = (forCheck = guild.GetRole(config.MuteRole.GetValueOrDefault(0))) == null
? Messages.RoleNotSpecified : forCheck.Mention;
var defaultRole = (forCheck = guild.GetRole(config.DefaultRole.GetValueOrDefault(0))) == null
? Messages.RoleNotSpecified : forCheck.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.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.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);
string.Format(Messages.CurrentSettingsDefaultRole, defaultRole, nl) +
string.Format(Messages.CurrentSettingsMuteRole, muteRole, nl) +
string.Format(Messages.CurrentSettingsAdminLogChannel, adminLogChannel, nl) +
string.Format(Messages.CurrentSettingsBotLogChannel, botLogChannel);
await Utils.SilentSendAsync(context.Channel as ITextChannel ?? throw new ApplicationException(), toSend);
return;
}
var setting = args[0].ToLower();
var shouldDefault = false;
var value = "";
if (args.Length >= 2)
value = args[1].ToLower();
else
shouldDefault = true;
try {
value = args[1].ToLower();
} catch (IndexOutOfRangeException) {
throw new ApplicationException(Messages.InvalidSettingValue);
}
var boolValue = ParseBool(value);
var channel = await Utils.ParseChannelNullable(value) as IGuildChannel;
var role = Utils.ParseRoleNullable(guild, value);
PropertyInfo? property = null;
foreach (var prop in typeof(GuildConfig).GetProperties())
if (setting == prop.Name.ToLower())
property = prop;
if (property == null || !property.CanWrite)
throw new ApplicationException(Messages.SettingDoesntExist);
var type = property.PropertyType;
switch (setting) {
case "reset":
Boyfriend.ResetGuildConfig(guild);
break;
case "lang" when value is not ("ru" or "en"):
if (value is "reset" or "default") {
property.SetValue(config, null);
} else if (type == typeof(string)) {
if (setting == "lang" && value is not ("ru" or "en"))
throw new ApplicationException(Messages.LanguageNotSupported);
case "lang":
config.Lang = shouldDefault ? "ru" : value;
Messages.Culture = new CultureInfo(shouldDefault ? "ru" : value);
break;
case "prefix":
config.Prefix = shouldDefault ? "!" : value;
break;
case "removerolesonmute":
config.RemoveRolesOnMute = !shouldDefault && GetBoolValue(boolValue);
break;
case "usesystemchannel":
config.UseSystemChannel = shouldDefault || GetBoolValue(boolValue);
break;
case "sendwelcomemessages":
config.SendWelcomeMessages = shouldDefault || GetBoolValue(boolValue);
break;
case "receivestartupmessages":
config.ReceiveStartupMessages = shouldDefault || GetBoolValue(boolValue);
break;
case "welcomemessage":
config.WelcomeMessage = shouldDefault ? Messages.DefaultWelcomeMessage : value;
break;
case "defaultrole":
config.DefaultRole = shouldDefault ? 0 : GetRoleId(role);
break;
case "muterole":
config.MuteRole = shouldDefault ? 0 : GetRoleId(role);
break;
case "adminlogchannel":
config.AdminLogChannel = shouldDefault ? 0 : GetChannelId(channel);
break;
case "botlogchannel":
config.BotLogChannel = shouldDefault ? 0 : GetChannelId(channel);
break;
default:
await context.Channel.SendMessageAsync(Messages.SettingDoesntExist);
return;
property.SetValue(config, value);
} else {
try {
if (type == typeof(bool?))
property.SetValue(config, Convert.ToBoolean(value));
if (type == typeof(ulong?)) {
var id = Convert.ToUInt64(value);
if (property.Name.EndsWith("Channel") && guild.GetTextChannel(id) == null)
throw new ApplicationException(Messages.InvalidChannel);
if (property.Name.EndsWith("Role") && guild.GetRole(id) == null)
throw new ApplicationException(Messages.InvalidRole);
property.SetValue(config, id);
}
} catch (Exception e) when (e is FormatException or OverflowException) {
throw new ApplicationException(Messages.InvalidSettingValue);
}
}
config.Validate();
await config.Save();
await context.Channel.SendMessageAsync(Messages.SettingsUpdated);
}
private static bool? ParseBool(string toParse) {
try {
return bool.Parse(toParse.ToLower());
} catch (FormatException) {
return null;
}
}
private static bool GetBoolValue(bool? from) {
return from ?? throw new ApplicationException(Messages.InvalidBoolean);
}
private static ulong GetRoleId(IRole? role) {
return (role ?? throw new ApplicationException(Messages.InvalidRoleSpecified)).Id;
}
private static ulong GetChannelId(IGuildChannel? channel) {
return (channel ?? throw new ApplicationException(Messages.InvalidChannelSpecified)).Id;
}
private static string YesOrNo(bool isYes) {
return isYes ? Messages.Yes : Messages.No;
}
@ -142,4 +108,4 @@ public class SettingsCommand : Command {
public override string GetSummary() {
return "Настраивает бота отдельно для этого сервера";
}
}
}