refactor: move ContextExts to own folder, CommandTree / command defs to CommandMeta folder

PluralKit.Bot/CommandSystem/Context/ContextAvatarExt.cs

@@ -0,0 +1,61 @@
+#nullable enable
+using Myriad.Extensions;
+using Myriad.Types;
+
+namespace PluralKit.Bot;
+
+public static class ContextAvatarExt
+{
+    public static async Task<ParsedImage?> MatchImage(this Context ctx)
+    {
+        // If we have a user @mention/ID, use their avatar
+        if (await ctx.MatchUser() is { } user)
+        {
+            var url = user.AvatarUrl("png", 256);
+            return new ParsedImage { Url = url, Source = AvatarSource.User, SourceUser = user };
+        }
+
+        // If we have a positional argument, try to parse it as a URL
+        var arg = ctx.RemainderOrNull();
+        if (arg != null)
+        {
+            // Allow surrounding the URL with <angle brackets> to "de-embed"
+            if (arg.StartsWith("<") && arg.EndsWith(">"))
+                arg = arg.Substring(1, arg.Length - 2);
+
+            if (!Uri.TryCreate(arg, UriKind.Absolute, out var uri))
+                throw Errors.InvalidUrl(arg);
+
+            if (uri.Scheme != "http" && uri.Scheme != "https")
+                throw Errors.InvalidUrl(arg);
+
+            // ToString URL-decodes, which breaks URLs to spaces; AbsoluteUri doesn't
+            return new ParsedImage { Url = uri.AbsoluteUri, Source = AvatarSource.Url };
+        }
+
+        // If we have an attachment, use that
+        if (ctx.Message.Attachments.FirstOrDefault() is { } attachment)
+        {
+            var url = attachment.ProxyUrl;
+            return new ParsedImage { Url = url, Source = AvatarSource.Attachment };
+        }
+
+        // We should only get here if there are no arguments (which would get parsed as URL + throw if error)
+        // and if there are no attachments (which would have been caught just before)
+        return null;
+    }
+}
+
+public struct ParsedImage
+{
+    public string Url;
+    public AvatarSource Source;
+    public User? SourceUser;
+}
+
+public enum AvatarSource
+{
+    Url,
+    User,
+    Attachment
+}

PluralKit.Bot/CommandSystem/Context/ContextPrivacyExt.cs

@@ -0,0 +1,60 @@
+using PluralKit.Core;
+
+namespace PluralKit.Bot;
+
+public static class ContextPrivacyExt
+{
+    public static PrivacyLevel PopPrivacyLevel(this Context ctx)
+    {
+        if (ctx.Match("public", "show", "shown", "visible"))
+            return PrivacyLevel.Public;
+
+        if (ctx.Match("private", "hide", "hidden"))
+            return PrivacyLevel.Private;
+
+        if (!ctx.HasNext())
+            throw new PKSyntaxError("You must pass a privacy level (`public` or `private`)");
+
+        throw new PKSyntaxError(
+            $"Invalid privacy level {ctx.PopArgument().AsCode()} (must be `public` or `private`).");
+    }
+
+    public static SystemPrivacySubject PopSystemPrivacySubject(this Context ctx)
+    {
+        if (!SystemPrivacyUtils.TryParseSystemPrivacy(ctx.PeekArgument(), out var subject))
+            throw new PKSyntaxError(
+                $"Invalid privacy subject {ctx.PopArgument().AsCode()} (must be `description`, `members`, `front`, `fronthistory`, `groups`, or `all`).");
+
+        ctx.PopArgument();
+        return subject;
+    }
+
+    public static MemberPrivacySubject PopMemberPrivacySubject(this Context ctx)
+    {
+        if (!MemberPrivacyUtils.TryParseMemberPrivacy(ctx.PeekArgument(), out var subject))
+            throw new PKSyntaxError(
+                $"Invalid privacy subject {ctx.PopArgument().AsCode()} (must be `name`, `description`, `avatar`, `birthday`, `pronouns`, `metadata`, `visibility`, or `all`).");
+
+        ctx.PopArgument();
+        return subject;
+    }
+
+    public static GroupPrivacySubject PopGroupPrivacySubject(this Context ctx)
+    {
+        if (!GroupPrivacyUtils.TryParseGroupPrivacy(ctx.PeekArgument(), out var subject))
+            throw new PKSyntaxError(
+                $"Invalid privacy subject {ctx.PopArgument().AsCode()} (must be `description`, `icon`, `visibility`, or `all`).");
+
+        ctx.PopArgument();
+        return subject;
+    }
+
+    public static bool MatchPrivateFlag(this Context ctx, LookupContext pctx)
+    {
+        var privacy = true;
+        if (ctx.MatchFlag("a", "all")) privacy = false;
+        if (pctx == LookupContext.ByNonOwner && !privacy) throw Errors.LookupNotAllowed;
+
+        return privacy;
+    }
+}