feat: pk;config

2021-11-29 21:35:21 -05:00
parent d195c80d92
commit 56d07e0f2d
41 changed files with 648 additions and 313 deletions
--- a/PluralKit.Bot/CommandMeta/CommandHelp.cs
+++ b/PluralKit.Bot/CommandMeta/CommandHelp.cs
@@ -12,18 +12,18 @@ public partial class CommandTree
    public static Command SystemAvatar = new Command("system icon", "system icon [url|@mention]", "Changes your system's icon");
    public static Command SystemBannerImage = new Command("system banner", "system banner [url]", "Set the system's banner image");
    public static Command SystemDelete = new Command("system delete", "system delete", "Deletes your system");
-    public static Command SystemTimezone = new Command("system timezone", "system timezone [timezone]", "Changes your system's time zone");
    public static Command SystemProxy = new Command("system proxy", "system proxy [server id] [on|off]", "Enables or disables message proxying in a specific server");
    public static Command SystemList = new Command("system list", "system [system] list [full]", "Lists a system's members");
    public static Command SystemFind = new Command("system find", "system [system] find [full] <search term>", "Searches a system's members given a search term");
    public static Command SystemFronter = new Command("system fronter", "system [system] fronter", "Shows a system's fronter(s)");
    public static Command SystemFrontHistory = new Command("system fronthistory", "system [system] fronthistory", "Shows a system's front history");
    public static Command SystemFrontPercent = new Command("system frontpercent", "system [system] frontpercent [timespan]", "Shows a system's front breakdown");
-    public static Command SystemPing = new Command("system ping", "system ping <enable|disable>", "Changes your system's ping preferences");
    public static Command SystemPrivacy = new Command("system privacy", "system privacy <description|members|fronter|fronthistory|all> <public|private>", "Changes your system's privacy settings");
+    public static Command ConfigTimezone = new Command("config timezone", "config timezone [timezone]", "Changes your system's time zone");
+    public static Command ConfigPing = new Command("config ping", "config ping <enable|disable>", "Changes your system's ping preferences");
+    public static Command ConfigAutoproxyAccount = new Command("config autoproxy account", "autoproxy account [on|off]", "Toggles autoproxy globally for the current account");
+    public static Command ConfigAutoproxyTimeout = new Command("config autoproxy timeout", "autoproxy timeout [<duration>|off|reset]", "Sets the latch timeout duration for your system");
    public static Command AutoproxySet = new Command("autoproxy", "autoproxy [off|front|latch|member]", "Sets your system's autoproxy mode for the current server");
-    public static Command AutoproxyTimeout = new Command("autoproxy", "autoproxy timeout [<duration>|off|reset]", "Sets the latch timeout duration for your system");
-    public static Command AutoproxyAccount = new Command("autoproxy", "autoproxy account [on|off]", "Toggles autoproxy globally for the current account");
    public static Command MemberInfo = new Command("member", "member <member>", "Looks up information about a member");
    public static Command MemberNew = new Command("member new", "member new <name>", "Creates a new member");
    public static Command MemberRename = new Command("member rename", "member <member> rename <new name>", "Renames a member");
@@ -95,8 +95,7 @@ public partial class CommandTree
    public static Command[] SystemCommands =
    {
        SystemInfo, SystemNew, SystemRename, SystemTag, SystemDesc, SystemAvatar, SystemBannerImage, SystemColor,
-        SystemDelete, SystemTimezone, SystemList, SystemFronter, SystemFrontHistory, SystemFrontPercent,
-        SystemPrivacy, SystemProxy
+        SystemDelete, SystemList, SystemFronter, SystemFrontHistory, SystemFrontPercent, SystemPrivacy, SystemProxy
    };

    public static Command[] MemberCommands =
@@ -124,7 +123,10 @@ public partial class CommandTree
        Switch, SwitchOut, SwitchMove, SwitchEdit, SwitchEditOut, SwitchDelete, SwitchDeleteAll
    };

-    public static Command[] AutoproxyCommands = { AutoproxySet, AutoproxyTimeout, AutoproxyAccount };
+    public static Command[] ConfigCommands =
+    {
+        ConfigTimezone, ConfigPing, ConfigAutoproxyAccount, ConfigAutoproxyTimeout
+    };

    public static Command[] LogCommands = { LogChannel, LogChannelClear, LogEnable, LogDisable };

--- a/PluralKit.Bot/CommandMeta/CommandTree.cs
+++ b/PluralKit.Bot/CommandMeta/CommandTree.cs
@@ -20,6 +20,8 @@ public partial class CommandTree
            return CommandHelpRoot(ctx);
        if (ctx.Match("ap", "autoproxy", "auto"))
            return HandleAutoproxyCommand(ctx);
+        if (ctx.Match("config", "cfg"))
+            return HandleConfigCommand(ctx);
        if (ctx.Match("list", "find", "members", "search", "query", "l", "f", "fd"))
            return ctx.Execute<SystemList>(SystemList, m => m.MemberList(ctx, ctx.System));
        if (ctx.Match("link"))
@@ -167,7 +169,7 @@ public partial class CommandTree
        else if (ctx.Match("webhook", "hook"))
            await ctx.Execute<Api>(null, m => m.SystemWebhook(ctx));
        else if (ctx.Match("timezone", "tz"))
-            await ctx.Execute<SystemEdit>(SystemTimezone, m => m.SystemTimezone(ctx));
+            await ctx.Execute<Config>(ConfigTimezone, m => m.SystemTimezone(ctx), true);
        else if (ctx.Match("proxy"))
            await ctx.Execute<SystemEdit>(SystemProxy, m => m.SystemProxy(ctx));
        else if (ctx.Match("list", "l", "members"))
@@ -190,7 +192,7 @@ public partial class CommandTree
        else if (ctx.Match("privacy"))
            await ctx.Execute<SystemEdit>(SystemPrivacy, m => m.SystemPrivacy(ctx));
        else if (ctx.Match("ping"))
-            await ctx.Execute<SystemEdit>(SystemPing, m => m.SystemPing(ctx));
+            await ctx.Execute<Config>(ConfigPing, m => m.SystemPing(ctx), true);
        else if (ctx.Match("commands", "help"))
            await PrintCommandList(ctx, "systems", SystemCommands);
        else if (ctx.Match("groups", "gs", "g"))
@@ -206,8 +208,7 @@ public partial class CommandTree
        if (target == null)
        {
            var list = CreatePotentialCommandList(SystemInfo, SystemNew, SystemRename, SystemTag, SystemDesc,
-                SystemAvatar, SystemDelete, SystemTimezone, SystemList, SystemFronter, SystemFrontHistory,
-                SystemFrontPercent);
+                SystemAvatar, SystemDelete, SystemList, SystemFronter, SystemFrontHistory, SystemFrontPercent);
            await ctx.Reply(
                $"{Emojis.Error} {await CreateSystemNotFoundError(ctx)}\n\nPerhaps you meant to use one of the following commands?\n{list}");
        }
@@ -435,9 +436,9 @@ public partial class CommandTree
            case "bl":
                await PrintCommandList(ctx, "channel blacklisting", BlacklistCommands);
                break;
-            case "autoproxy":
-            case "ap":
-                await PrintCommandList(ctx, "autoproxy", AutoproxyCommands);
+            case "config":
+            case "cfg":
+                await PrintCommandList(ctx, "settings", ConfigCommands);
                break;
            // todo: are there any commands that still need to be added?
            default:
@@ -448,22 +449,43 @@ public partial class CommandTree

    private Task HandleAutoproxyCommand(Context ctx)
    {
-        if (ctx.Match("commands"))
-            return PrintCommandList(ctx, "autoproxy", AutoproxyCommands);
-
        // ctx.CheckSystem();
        // oops, that breaks stuff! PKErrors before ctx.Execute don't actually do anything.
        // so we just emulate checking and throwing an error.
        if (ctx.System == null)
            return ctx.Reply($"{Emojis.Error} {Errors.NoSystemError.Message}");

+        // todo: move this whole block to Autoproxy.cs when these are removed
+
        if (ctx.Match("account", "ac"))
-            return ctx.Execute<Autoproxy>(AutoproxyAccount, m => m.AutoproxyAccount(ctx));
+            return ctx.Execute<Config>(ConfigAutoproxyAccount, m => m.AutoproxyAccount(ctx), true);
        if (ctx.Match("timeout", "tm"))
-            return ctx.Execute<Autoproxy>(AutoproxyTimeout, m => m.AutoproxyTimeout(ctx));
+            return ctx.Execute<Config>(ConfigAutoproxyTimeout, m => m.AutoproxyTimeout(ctx), true);
+
        return ctx.Execute<Autoproxy>(AutoproxySet, m => m.SetAutoproxyMode(ctx));
    }

+    private Task HandleConfigCommand(Context ctx)
+    {
+        if (ctx.System == null)
+            return ctx.Reply($"{Emojis.Error} {Errors.NoSystemError.Message}");
+
+        if (!ctx.HasNext())
+            return ctx.Execute<Config>(null, m => m.ShowConfig(ctx));
+
+        if (ctx.MatchMultiple(new[] { "autoproxy", "ap" }, new[] { "account", "ac" }))
+            return ctx.Execute<Config>(null, m => m.AutoproxyAccount(ctx));
+        if (ctx.MatchMultiple(new[] { "autoproxy", "ap" }, new[] { "timeout", "tm" }))
+            return ctx.Execute<Config>(null, m => m.AutoproxyTimeout(ctx));
+        if (ctx.Match("timezone", "zone", "tz"))
+            return ctx.Execute<Config>(null, m => m.SystemTimezone(ctx));
+        if (ctx.Match("ping"))
+            return ctx.Execute<Config>(null, m => m.SystemPing(ctx));
+
+        // todo: maybe add the list of configuration keys here?
+        return ctx.Reply($"{Emojis.Error} Could not find a setting with that name. Please see `pk;commands config` for the list of possible config settings.");
+    }
+
    private async Task PrintCommandNotFoundError(Context ctx, params Command[] potentialCommands)
    {
        var commandListStr = CreatePotentialCommandList(potentialCommands);