liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: check if system exists in HandleSystemCommandsTargeted

Browse Source
This commit is contained in:
spiral 2022-01-26 06:20:26 -05:00
parent af3702152f
commit efaf814e12
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
PluralKit.Bot/CommandMeta/CommandTree.cs
View File

@ -142,9 +142,7 @@ public partial class CommandTree
private async Task HandleSystemCommand(Context ctx) private async Task HandleSystemCommand(Context ctx)
{ {
// these commands never take a system target // these commands never take a system target
if (!ctx.HasNext()) if (ctx.Match("new", "create", "make", "add", "register", "init", "n"))
await ctx.Execute<System>(SystemInfo, m => m.Query(ctx, ctx.System));
else if (ctx.Match("new", "create", "make", "add", "register", "init", "n"))
await ctx.Execute<System>(SystemNew, m => m.New(ctx)); await ctx.Execute<System>(SystemNew, m => m.New(ctx));
else if (ctx.Match("commands", "help")) else if (ctx.Match("commands", "help"))
await PrintCommandList(ctx, "systems", SystemCommands); await PrintCommandList(ctx, "systems", SystemCommands);
@ -161,7 +159,7 @@ public partial class CommandTree
else if (ctx.Match("proxy")) else if (ctx.Match("proxy"))
await ctx.Execute<SystemEdit>(SystemProxy, m => m.SystemProxy(ctx)); await ctx.Execute<SystemEdit>(SystemProxy, m => m.SystemProxy(ctx));
// finally, parse commands that *do* take a system target // finally, parse commands that *can* take a system target
else else
{ {
// try matching a system ID // try matching a system ID
@ -172,11 +170,20 @@ public partial class CommandTree
// we skip the `target != null` check here since the argument isn't be popped if it's not a system // we skip the `target != null` check here since the argument isn't be popped if it's not a system
if (!ctx.HasNext()) if (!ctx.HasNext())
{ {
await ctx.Execute<System>(SystemInfo, m => m.Query(ctx, target)); await ctx.Execute<System>(SystemInfo, m => m.Query(ctx, target ?? ctx.System));
return; return;
} }
// hacky, but we need to CheckSystem(target) which throws a PKError
try
{
await HandleSystemCommandTargeted(ctx, target ?? ctx.System); await HandleSystemCommandTargeted(ctx, target ?? ctx.System);
}
catch (PKError e)
{
await ctx.Reply($"{Emojis.Error} {e.Message}");
return;
}
// if we *still* haven't matched anything, the user entered an invalid command name or system reference // if we *still* haven't matched anything, the user entered an invalid command name or system reference
if (ctx.Parameters._ptr == previousPtr) if (ctx.Parameters._ptr == previousPtr)
@ -197,44 +204,44 @@ public partial class CommandTree
private async Task HandleSystemCommandTargeted(Context ctx, PKSystem target) private async Task HandleSystemCommandTargeted(Context ctx, PKSystem target)
{ {
if (ctx.Match("name", "rename", "changename")) if (ctx.Match("name", "rename", "changename"))
await ctx.Execute<SystemEdit>(SystemRename, m => m.Name(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemRename, m => m.Name(ctx, target));
else if (ctx.Match("tag")) else if (ctx.Match("tag"))
await ctx.Execute<SystemEdit>(SystemTag, m => m.Tag(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemTag, m => m.Tag(ctx, target));
else if (ctx.Match("servertag")) else if (ctx.Match("servertag"))
await ctx.Execute<SystemEdit>(SystemServerTag, m => m.ServerTag(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemServerTag, m => m.ServerTag(ctx, target));
else if (ctx.Match("description", "desc", "bio")) else if (ctx.Match("description", "desc", "bio"))
await ctx.Execute<SystemEdit>(SystemDesc, m => m.Description(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemDesc, m => m.Description(ctx, target));
else if (ctx.Match("color", "colour")) else if (ctx.Match("color", "colour"))
await ctx.Execute<SystemEdit>(SystemColor, m => m.Color(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemColor, m => m.Color(ctx, target));
else if (ctx.Match("banner", "splash", "cover")) else if (ctx.Match("banner", "splash", "cover"))
await ctx.Execute<SystemEdit>(SystemBannerImage, m => m.BannerImage(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemBannerImage, m => m.BannerImage(ctx, target));
else if (ctx.Match("avatar", "picture", "icon", "image", "pic", "pfp")) else if (ctx.Match("avatar", "picture", "icon", "image", "pic", "pfp"))
await ctx.Execute<SystemEdit>(SystemAvatar, m => m.Avatar(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemAvatar, m => m.Avatar(ctx, target));
else if (ctx.Match("list", "l", "members")) else if (ctx.Match("list", "l", "members"))
await ctx.Execute<SystemList>(SystemList, m => m.MemberList(ctx, target)); await ctx.CheckSystem(target).Execute<SystemList>(SystemList, m => m.MemberList(ctx, target));
else if (ctx.Match("find", "search", "query", "fd", "s")) else if (ctx.Match("find", "search", "query", "fd", "s"))
await ctx.Execute<SystemList>(SystemFind, m => m.MemberList(ctx, target)); await ctx.CheckSystem(target).Execute<SystemList>(SystemFind, m => m.MemberList(ctx, target));
else if (ctx.Match("f", "front", "fronter", "fronters")) else if (ctx.Match("f", "front", "fronter", "fronters"))
{ {
if (ctx.Match("h", "history")) if (ctx.Match("h", "history"))
await ctx.Execute<SystemFront>(SystemFrontHistory, m => m.SystemFrontHistory(ctx, target)); await ctx.CheckSystem(target).Execute<SystemFront>(SystemFrontHistory, m => m.SystemFrontHistory(ctx, target));
else if (ctx.Match("p", "percent", "%")) else if (ctx.Match("p", "percent", "%"))
await ctx.Execute<SystemFront>(SystemFrontPercent, m => m.FrontPercent(ctx, system: target)); await ctx.CheckSystem(target).Execute<SystemFront>(SystemFrontPercent, m => m.FrontPercent(ctx, system: target));
else else
await ctx.Execute<SystemFront>(SystemFronter, m => m.SystemFronter(ctx, target)); await ctx.CheckSystem(target).Execute<SystemFront>(SystemFronter, m => m.SystemFronter(ctx, target));
} }
else if (ctx.Match("fh", "fronthistory", "history", "switches")) else if (ctx.Match("fh", "fronthistory", "history", "switches"))
await ctx.Execute<SystemFront>(SystemFrontHistory, m => m.SystemFrontHistory(ctx, target)); await ctx.CheckSystem(target).Execute<SystemFront>(SystemFrontHistory, m => m.SystemFrontHistory(ctx, target));
else if (ctx.Match("fp", "frontpercent", "front%", "frontbreakdown")) else if (ctx.Match("fp", "frontpercent", "front%", "frontbreakdown"))
await ctx.Execute<SystemFront>(SystemFrontPercent, m => m.FrontPercent(ctx, system: target)); await ctx.CheckSystem(target).Execute<SystemFront>(SystemFrontPercent, m => m.FrontPercent(ctx, system: target));
else if (ctx.Match("info", "view", "show")) else if (ctx.Match("info", "view", "show"))
await ctx.Execute<System>(SystemInfo, m => m.Query(ctx, target)); await ctx.CheckSystem(target).Execute<System>(SystemInfo, m => m.Query(ctx, target));
else if (ctx.Match("groups", "gs")) else if (ctx.Match("groups", "gs"))
await ctx.Execute<Groups>(GroupList, g => g.ListSystemGroups(ctx, target)); await ctx.CheckSystem(target).Execute<Groups>(GroupList, g => g.ListSystemGroups(ctx, target));
else if (ctx.Match("privacy")) else if (ctx.Match("privacy"))
await ctx.Execute<SystemEdit>(SystemPrivacy, m => m.SystemPrivacy(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemPrivacy, m => m.SystemPrivacy(ctx, target));
else if (ctx.Match("delete", "remove", "destroy", "erase", "yeet")) else if (ctx.Match("delete", "remove", "destroy", "erase", "yeet"))
await ctx.Execute<SystemEdit>(SystemDelete, m => m.Delete(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemDelete, m => m.Delete(ctx, target));
} }
private async Task HandleMemberCommand(Context ctx) private async Task HandleMemberCommand(Context ctx)

7
PluralKit.Bot/CommandSystem/Context/ContextChecksExt.cs
View File

@ -55,6 +55,13 @@ public static class ContextChecksExt
return ctx; return ctx;
} }
public static Context CheckSystem(this Context ctx, PKSystem system)
{
if (system == null)
throw Errors.NoSystemError;
return ctx;
}
public static Context CheckNoSystem(this Context ctx) public static Context CheckNoSystem(this Context ctx)
{ {
if (ctx.System != null) if (ctx.System != null)