From 2aaed56ca6bf13b46c50b2df4a5d555a02540df0 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Mon, 1 Jul 2024 20:31:55 +0500 Subject: [PATCH] i love reverting commits This reverts commit a4661116de8b4c2ca71370e96c03514a38d5d093. --- .../Commands/RemindCommandGroup.cs | 34 +++++-------------- TeamOctolings.Octobot/Messages.Designer.cs | 12 ------- TeamOctolings.Octobot/Messages.resx | 6 ---- TeamOctolings.Octobot/Messages.ru.resx | 6 ---- 4 files changed, 8 insertions(+), 50 deletions(-) diff --git a/TeamOctolings.Octobot/Commands/RemindCommandGroup.cs b/TeamOctolings.Octobot/Commands/RemindCommandGroup.cs index 27f74a0..be53ed7 100644 --- a/TeamOctolings.Octobot/Commands/RemindCommandGroup.cs +++ b/TeamOctolings.Octobot/Commands/RemindCommandGroup.cs @@ -158,22 +158,11 @@ public sealed class RemindCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct: CancellationToken); } - var replacedText = text.Replace("`", ""); - if (replacedText.Equals(string.Empty)) - { - var failedEmbed = new EmbedBuilder() - .WithSmallTitle(Messages.ReminderTextOnlyBanned, bot) - .WithColour(ColorsList.Red) - .Build(); - - return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct: CancellationToken); - } - - return await AddReminderAsync(timeSpan, text, replacedText, data, channelId, executor, CancellationToken); + return await AddReminderAsync(timeSpan, text, data, channelId, executor, CancellationToken); } - private async Task AddReminderAsync(TimeSpan timeSpan, string text, string replacedText, - GuildData data, Snowflake channelId, IUser executor, CancellationToken ct = default) + private async Task AddReminderAsync(TimeSpan timeSpan, string text, GuildData data, + Snowflake channelId, IUser executor, CancellationToken ct = default) { var memberData = data.GetOrCreateMemberData(executor.ID); var remindAt = DateTimeOffset.UtcNow.Add(timeSpan); @@ -188,24 +177,17 @@ public sealed class RemindCommandGroup : CommandGroup { At = remindAt, ChannelId = channelId.Value, - Text = replacedText, + Text = text, MessageId = response.ID.Value }); - var textEqualsReplaced = text.Equals(replacedText); - var builder = new StringBuilder().AppendBulletPointLine( - string.Format(Messages.ReminderText, Markdown.InlineCode(replacedText))); - if (!textEqualsReplaced) - { - builder.AppendSubBulletPointLine(Messages.ReminderTextContainedBanned); - } - - builder.AppendBulletPoint(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt))); - + var builder = new StringBuilder() + .AppendBulletPointLine(string.Format(Messages.ReminderText, Markdown.InlineCode(text))) + .AppendBulletPoint(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt))); var embed = new EmbedBuilder().WithSmallTitle( string.Format(Messages.ReminderCreated, executor.GetTag()), executor) .WithDescription(builder.ToString()) - .WithColour(textEqualsReplaced ? ColorsList.Green : ColorsList.Yellow) + .WithColour(ColorsList.Green) .WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count)) .Build(); diff --git a/TeamOctolings.Octobot/Messages.Designer.cs b/TeamOctolings.Octobot/Messages.Designer.cs index 5ea10f0..bbc1366 100644 --- a/TeamOctolings.Octobot/Messages.Designer.cs +++ b/TeamOctolings.Octobot/Messages.Designer.cs @@ -1196,17 +1196,5 @@ namespace TeamOctolings.Octobot { return ResourceManager.GetString("SettingsModeratorRole", resourceCulture); } } - - internal static string ReminderTextContainedBanned { - get { - return ResourceManager.GetString("ReminderTextContainedBanned", resourceCulture); - } - } - - internal static string ReminderTextOnlyBanned { - get { - return ResourceManager.GetString("ReminderTextOnlyBanned", resourceCulture); - } - } } } diff --git a/TeamOctolings.Octobot/Messages.resx b/TeamOctolings.Octobot/Messages.resx index 9f7955d..47e7d4f 100644 --- a/TeamOctolings.Octobot/Messages.resx +++ b/TeamOctolings.Octobot/Messages.resx @@ -681,10 +681,4 @@ Moderator role - - Reminder text contained banned characters. - - - Reminder text contains only banned characters! - diff --git a/TeamOctolings.Octobot/Messages.ru.resx b/TeamOctolings.Octobot/Messages.ru.resx index d6c5446..2eef257 100644 --- a/TeamOctolings.Octobot/Messages.ru.resx +++ b/TeamOctolings.Octobot/Messages.ru.resx @@ -681,10 +681,4 @@ Роль модератора - - Текст напоминания содержал запрещенные символы. - - - Текст напоминания содержит только запрещенные символы! -