eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(bot): separate MatchClear from ConfirmClear

Browse source
This commit is contained in:
spiral 2022-12-01 07:16:36 +00:00
parent f06fdb38ef
commit f9abcc68c4
No known key found for this signature in database
GPG key ID: 244A11E4B0BCF40E
9 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PluralKit.Bot/CommandSystem/Context/ContextArgumentsExt.cs
View file

@ -88,15 +88,7 @@ public static class ContextArgumentsExt
return potentialMatches.Any(potentialMatch => flags.Contains(potentialMatch));
}
public static async Task<bool> MatchClear(this Context ctx, string toClear = null)
{
var matched = ctx.MatchClearInner();
if (matched && toClear != null)
return await ctx.ConfirmClear(toClear);
return matched;
}
private static bool MatchClearInner(this Context ctx)
public static bool MatchClear(this Context ctx)
=> ctx.Match("clear", "reset", "default") || ctx.MatchFlag("c", "clear");
public static bool MatchRaw(this Context ctx) =>
@ -111,7 +103,7 @@ public static class ContextArgumentsExt
public static bool? MatchToggleOrNull(this Context ctx, bool? defaultValue = null)
{
if (defaultValue != null && ctx.MatchClearInner())
if (defaultValue != null && ctx.MatchClear())
return defaultValue.Value;
var yesToggles = new[] { "yes", "on", "enable", "enabled", "true" };