TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-19 16:33:36 +03:00
Code Issues Wiki Activity

i love reverting commits

Browse source 
This reverts commit a4661116de.
This commit is contained in:
Macintxsh 2024-07-01 20:31:55 +05:00
parent a4661116de
commit 2aaed56ca6
Signed by: mctaylors
GPG key ID: 4EEF4F949A266EE2
4 changed files with 8 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
TeamOctolings.Octobot/Commands/RemindCommandGroup.cs
View file

@ -158,22 +158,11 @@ public sealed class RemindCommandGroup : CommandGroup
return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct: CancellationToken); return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct: CancellationToken);
} }
var replacedText = text.Replace("`", ""); return await AddReminderAsync(timeSpan, text, data, channelId, executor, CancellationToken);
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); private async Task<Result> AddReminderAsync(TimeSpan timeSpan, string text, GuildData data,
} Snowflake channelId, IUser executor, CancellationToken ct = default)
private async Task<Result> AddReminderAsync(TimeSpan timeSpan, string text, string replacedText,
GuildData data, Snowflake channelId, IUser executor, CancellationToken ct = default)
{ {
var memberData = data.GetOrCreateMemberData(executor.ID); var memberData = data.GetOrCreateMemberData(executor.ID);
var remindAt = DateTimeOffset.UtcNow.Add(timeSpan); var remindAt = DateTimeOffset.UtcNow.Add(timeSpan);
@ -188,24 +177,17 @@ public sealed class RemindCommandGroup : CommandGroup
{ {
At = remindAt, At = remindAt,
ChannelId = channelId.Value, ChannelId = channelId.Value,
Text = replacedText, Text = text,
MessageId = response.ID.Value MessageId = response.ID.Value
}); });
var textEqualsReplaced = text.Equals(replacedText); var builder = new StringBuilder()
var builder = new StringBuilder().AppendBulletPointLine( .AppendBulletPointLine(string.Format(Messages.ReminderText, Markdown.InlineCode(text)))
string.Format(Messages.ReminderText, Markdown.InlineCode(replacedText))); .AppendBulletPoint(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt)));
if (!textEqualsReplaced)
{
builder.AppendSubBulletPointLine(Messages.ReminderTextContainedBanned);
}
builder.AppendBulletPoint(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt)));
var embed = new EmbedBuilder().WithSmallTitle( var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.ReminderCreated, executor.GetTag()), executor) string.Format(Messages.ReminderCreated, executor.GetTag()), executor)
.WithDescription(builder.ToString()) .WithDescription(builder.ToString())
.WithColour(textEqualsReplaced ? ColorsList.Green : ColorsList.Yellow) .WithColour(ColorsList.Green)
.WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count)) .WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count))
.Build(); .Build();

12
TeamOctolings.Octobot/Messages.Designer.cs generated
View file

@ -1196,17 +1196,5 @@ namespace TeamOctolings.Octobot {
return ResourceManager.GetString("SettingsModeratorRole", resourceCulture); 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);
}
}
} }
} }

6
TeamOctolings.Octobot/Messages.resx
View file

@ -681,10 +681,4 @@
<data name="SettingsModeratorRole" xml:space="preserve"> <data name="SettingsModeratorRole" xml:space="preserve">
<value>Moderator role</value> <value>Moderator role</value>
</data> </data>
<data name="ReminderTextContainedBanned" xml:space="preserve">
<value>Reminder text contained banned characters.</value>
</data>
<data name="ReminderTextOnlyBanned" xml:space="preserve">
<value>Reminder text contains only banned characters!</value>
</data>
</root> </root>

6
TeamOctolings.Octobot/Messages.ru.resx
View file

@ -681,10 +681,4 @@
<data name="SettingsModeratorRole" xml:space="preserve"> <data name="SettingsModeratorRole" xml:space="preserve">
<value>Роль модератора</value> <value>Роль модератора</value>
</data> </data>
<data name="ReminderTextContainedBanned" xml:space="preserve">
<value>Текст напоминания содержал запрещенные символы.</value>
</data>
<data name="ReminderTextOnlyBanned" xml:space="preserve">
<value>Текст напоминания содержит только запрещенные символы!</value>
</data>
</root> </root>