RPCS3/discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2024-12-13 13:46:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor fixes to the management commands

Browse Source
This commit is contained in:
13xforever 2019-07-26 23:03:41 +05:00
parent 74370e61cd
commit 68631285dd
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CompatBot/Commands/Antipiracy.cs
View File

@ -39,7 +39,7 @@ namespace CompatBot.Commands
new AsciiColumn("Custom message")
);
using (var db = new BotDb())
foreach (var item in await db.Piracystring.Where(ps => !ps.Disabled).OrderBy(ps => ps.String).ToListAsync().ConfigureAwait(false))
foreach (var item in await db.Piracystring.Where(ps => !ps.Disabled).OrderBy(ps => ps.String, StringComparer.InvariantCultureIgnoreCase).ToListAsync().ConfigureAwait(false))
{
table.Add(
item.Id.ToString(),
@ -67,7 +67,7 @@ namespace CompatBot.Commands
{
filter = await db.Piracystring.FirstOrDefaultAsync(ps => ps.String == trigger).ConfigureAwait(false);
if (filter == null)
filter = new Piracystring();
filter = new Piracystring {String = trigger};
else
filter.Disabled = false;
}
@ -669,7 +669,8 @@ namespace CompatBot.Commands
if (!string.IsNullOrEmpty(error))
result.AddField("Entry error", error);
result.AddFieldEx((string.IsNullOrEmpty(filter.String) ? "⚠ " : "") + "Trigger", filter.String, highlight == field++, true)
var validTrigger = string.IsNullOrEmpty(filter.String) || filter.String.Length < Config.MinimumPiracyTriggerLength ? "⚠ " : "";
result.AddFieldEx(validTrigger + "Trigger", filter.String, highlight == field++, true)
.AddFieldEx("Context", filter.Context.ToString(), highlight == field++, true)
.AddFieldEx("Actions", filter.Actions.ToFlagsString(), highlight == field++, true)
.AddFieldEx("Validation", filter.ValidatingRegex, highlight == field++, true);
@ -677,7 +678,10 @@ namespace CompatBot.Commands
result.AddFieldEx("Message", filter.CustomMessage, highlight == field, true);
field++;
if (filter.Actions.HasFlag(FilterAction.ShowExplain))
result.AddFieldEx((string.IsNullOrEmpty(filter.ExplainTerm) ? "⚠ " : "") + "Explain", filter.ExplainTerm, highlight == field, true);
{
var validExplainTerm = string.IsNullOrEmpty(filter.ExplainTerm) ? "⚠ " : "";
result.AddFieldEx(validExplainTerm + "Explain", filter.ExplainTerm, highlight == field, true);
}
return result;
}
}

2
CompatBot/Utils/Extensions/BotDbExtensions.cs
View File

@ -15,7 +15,7 @@ namespace CompatBot.Utils
public static bool IsComplete(this Piracystring filter)
{
var result = !string.IsNullOrEmpty(filter.String)
&& filter.String.Length > 4
&& filter.String.Length >= Config.MinimumPiracyTriggerLength
&& filter.Actions != 0;
if (result && filter.Actions.HasFlag(FilterAction.ShowExplain))
result = !string.IsNullOrEmpty(filter.ExplainTerm);