From 71da4d11c0b055f63582ab7c3d47548ec853459a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 12 Jul 2021 21:10:39 +0200 Subject: [PATCH] - Removed static color fields - Removed unused code - BanTemplate will get error color from bot config --- src/NadekoBot/Bot.cs | 5 --- src/NadekoBot/Common/IEmbedBuilder.cs | 1 - .../Services/UserPunishService.cs | 10 +++--- .../Services/Settings/BotConfigService.cs | 4 --- .../_Extensions/IMessageChannelExtensions.cs | 34 ------------------- 5 files changed, 6 insertions(+), 48 deletions(-) diff --git a/src/NadekoBot/Bot.cs b/src/NadekoBot/Bot.cs index b5533265d..dfd8db2e9 100644 --- a/src/NadekoBot/Bot.cs +++ b/src/NadekoBot/Bot.cs @@ -35,11 +35,6 @@ namespace NadekoBot public DiscordSocketClient Client { get; } public ImmutableArray AllGuildConfigs { get; private set; } - // todo remove colors from here - public static Color OkColor { get; set; } - public static Color ErrorColor { get; set; } - public static Color PendingColor { get; set; } - private IServiceProvider Services { get; set; } public string Mention { get; private set; } diff --git a/src/NadekoBot/Common/IEmbedBuilder.cs b/src/NadekoBot/Common/IEmbedBuilder.cs index 8579dd42d..7c65e2143 100644 --- a/src/NadekoBot/Common/IEmbedBuilder.cs +++ b/src/NadekoBot/Common/IEmbedBuilder.cs @@ -1,6 +1,5 @@ using Discord; -// todo test guild colors namespace NadekoBot { public interface IEmbedBuilder diff --git a/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs b/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs index 730e572ec..5609f808a 100644 --- a/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs +++ b/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs @@ -25,14 +25,16 @@ namespace NadekoBot.Modules.Administration.Services private readonly MuteService _mute; private readonly DbService _db; private readonly BlacklistService _blacklistService; + private readonly BotConfigService _bcs; private readonly Timer _warnExpiryTimer; - public UserPunishService(MuteService mute, DbService db, BlacklistService blacklistService) + public UserPunishService(MuteService mute, DbService db, BlacklistService blacklistService, BotConfigService bcs) { _mute = mute; _db = db; _blacklistService = blacklistService; - + _bcs = bcs; + _warnExpiryTimer = new Timer(async _ => { await CheckAllWarnExpiresAsync(); @@ -455,7 +457,7 @@ WHERE GuildId={guildId} { template = JsonConvert.SerializeObject(new { - color = Bot.ErrorColor.RawValue, + color = _bcs.Data.Color.Error, description = defaultMessage }); } @@ -470,7 +472,7 @@ WHERE GuildId={guildId} { template = JsonConvert.SerializeObject(new { - color = Bot.ErrorColor.RawValue, + color = _bcs.Data.Color.Error, description = template }); } diff --git a/src/NadekoBot/Services/Settings/BotConfigService.cs b/src/NadekoBot/Services/Settings/BotConfigService.cs index b2744331f..f30107da2 100644 --- a/src/NadekoBot/Services/Settings/BotConfigService.cs +++ b/src/NadekoBot/Services/Settings/BotConfigService.cs @@ -36,10 +36,6 @@ namespace NadekoBot.Services var ok = _data.Color.Ok; var error = _data.Color.Error; var pend = _data.Color.Pending; - // todo future remove these static props once cleanup is done - Bot.OkColor = new Color(ok.R, ok.G, ok.B); - Bot.ErrorColor = new Color(error.R, error.G, error.B); - Bot.PendingColor = new Color(pend.R, pend.G, pend.B); } protected override void OnStateUpdate() diff --git a/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs b/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs index 6d5ac1a54..e9fc71c97 100644 --- a/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs +++ b/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs @@ -185,39 +185,5 @@ namespace NadekoBot.Extensions public static Task WarningAsync(this ICommandContext ctx) => ctx.Message.AddReactionAsync(new Emoji("⚠️")); - - // todo fix extensions - // public static Task EditAsync(this IUserMessage message, SmartText text) - // { - // switch (text) - // { - // case SmartEmbedText set: return message.ModifyAsync(set.PlainText ?? "", set.GetEmbed()); - // case SmartPlainText spt: return message.EditAsync(spt.Text); - // default: - // throw new ArgumentException(nameof(text)); - // } - // } - // - // public static Task SendAsync(this IUser user, SmartText text) - // { - // switch (text) - // { - // case SmartEmbedText set: return user.SendAsync(set.PlainText ?? "", set.GetEmbed()); - // case SmartPlainText spt: return user.SendAsync(spt.Text); - // default: - // throw new ArgumentException(nameof(text)); - // } - // } - // - // public static Task SendAsync(this ITextChannel channel, SmartText text) - // { - // switch (text) - // { - // case SmartEmbedText set: return channel.SendAsync(set.PlainText ?? "", embed: set.GetEmbed()); - // case SmartPlainText spt: return channel.SendAsync(spt.Text); - // default: - // throw new ArgumentException(nameof(text)); - // } - // } } }