feat: implement member edit commands

PluralKit.Bot/CommandMeta/CommandTree.cs

@@ -16,6 +16,41 @@ public partial class CommandTree
             Commands.MemberShow(var param, _) => ctx.Execute<Member>(MemberInfo, m => m.ViewMember(ctx, param.target)),
             Commands.MemberNew(var param, _) => ctx.Execute<Member>(MemberNew, m => m.NewMember(ctx, param.name)),
             Commands.MemberSoulscream(var param, _) => ctx.Execute<Member>(MemberInfo, m => m.Soulscream(ctx, param.target)),
+            Commands.MemberPronounsShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberPronouns, m => m.ShowPronouns(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberPronounsClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberPronouns, m => m.ClearPronouns(ctx, param.target, flags.yes)),
+            Commands.MemberPronounsUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberPronouns, m => m.ChangePronouns(ctx, param.target, param.pronouns)),
+            Commands.MemberDescShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberDesc, m => m.ShowDescription(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberDescClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberDesc, m => m.ClearDescription(ctx, param.target, flags.yes)),
+            Commands.MemberDescUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberDesc, m => m.ChangeDescription(ctx, param.target, param.description)),
+            Commands.MemberNameShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberInfo, m => m.ShowName(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberNameUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberInfo, m => m.ChangeName(ctx, param.target, param.name)),
+            Commands.MemberBannerShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberBannerImage, m => m.ShowBannerImage(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberBannerClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberBannerImage, m => m.ClearBannerImage(ctx, param.target, flags.yes)),
+            Commands.MemberBannerUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberBannerImage, m => m.ChangeBannerImage(ctx, param.target, param.banner)),
+            Commands.MemberColorShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberColor, m => m.ShowColor(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberColorClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberColor, m => m.ClearColor(ctx, param.target, flags.yes)),
+            Commands.MemberColorUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberColor, m => m.ChangeColor(ctx, param.target, param.color)),
+            Commands.MemberBirthdayShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberBirthday, m => m.ShowBirthday(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberBirthdayClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberBirthday, m => m.ClearBirthday(ctx, param.target, flags.yes)),
+            Commands.MemberBirthdayUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberBirthday, m => m.ChangeBirthday(ctx, param.target, param.birthday)),
+            Commands.MemberDisplaynameShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberDisplayName, m => m.ShowDisplayName(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberDisplaynameClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberDisplayName, m => m.ClearDisplayName(ctx, param.target, flags.yes)),
+            Commands.MemberDisplaynameUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberDisplayName, m => m.ChangeDisplayName(ctx, param.target, param.name)),
+            Commands.MemberServernameShow(var param, var flags) => ctx.Execute<MemberEdit>(MemberServerName, m => m.ShowServerName(ctx, param.target, flags.GetReplyFormat())),
+            Commands.MemberServernameClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberServerName, m => m.ClearServerName(ctx, param.target, flags.yes)),
+            Commands.MemberServernameUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberServerName, m => m.ChangeServerName(ctx, param.target, param.name)),
+            Commands.MemberKeepproxyShow(var param, _) => ctx.Execute<MemberEdit>(MemberKeepProxy, m => m.ShowKeepProxy(ctx, param.target)),
+            Commands.MemberKeepproxyUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberKeepProxy, m => m.ChangeKeepProxy(ctx, param.target, param.value)),
+            Commands.MemberServerKeepproxyShow(var param, _) => ctx.Execute<MemberEdit>(MemberServerKeepProxy, m => m.ShowServerKeepProxy(ctx, param.target)),
+            Commands.MemberServerKeepproxyUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberServerKeepProxy, m => m.ChangeServerKeepProxy(ctx, param.target, param.value)),
+            Commands.MemberServerKeepproxyClear(var param, var flags) => ctx.Execute<MemberEdit>(MemberServerKeepProxy, m => m.ClearServerKeepProxy(ctx, param.target, flags.yes)),
+            Commands.MemberTtsShow(var param, _) => ctx.Execute<MemberEdit>(MemberTts, m => m.ShowTts(ctx, param.target)),
+            Commands.MemberTtsUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberTts, m => m.ChangeTts(ctx, param.target, param.value)),
+            Commands.MemberAutoproxyShow(var param, _) => ctx.Execute<MemberEdit>(MemberAutoproxy, m => m.ShowAutoproxy(ctx, param.target)),
+            Commands.MemberAutoproxyUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberAutoproxy, m => m.ChangeAutoproxy(ctx, param.target, param.value)),
+            Commands.MemberDelete(var param, _) => ctx.Execute<MemberEdit>(MemberDelete, m => m.Delete(ctx, param.target)),
+            Commands.MemberPrivacyShow(var param, _) => ctx.Execute<MemberEdit>(MemberPrivacy, m => m.ShowPrivacy(ctx, param.target)),
+            Commands.MemberPrivacyUpdate(var param, _) => ctx.Execute<MemberEdit>(MemberPrivacy, m => m.ChangePrivacy(ctx, param.target, param.member_privacy_target, param.new_privacy_level)),
             Commands.CfgApAccountShow => ctx.Execute<Config>(null, m => m.ViewAutoproxyAccount(ctx)),
             Commands.CfgApAccountUpdate(var param, _) => ctx.Execute<Config>(null, m => m.EditAutoproxyAccount(ctx, param.toggle)),
             Commands.CfgApTimeoutShow => ctx.Execute<Config>(null, m => m.ViewAutoproxyTimeout(ctx)),
@@ -378,45 +413,29 @@ public partial class CommandTree
     private async Task HandleMemberCommand(Context ctx)
     {
         // TODO: implement
-        // if (ctx.Match("new", "n", "add", "create", "register"))
+        if (ctx.Match("list"))
-        //     await ctx.Execute<Member>(MemberNew, m => m.NewMember(ctx));
+            await ctx.Execute<SystemList>(SystemList, m => m.MemberList(ctx, ctx.System));
-        // else if (ctx.Match("list"))
+        else if (ctx.Match("commands", "help"))
-        //     await ctx.Execute<SystemList>(SystemList, m => m.MemberList(ctx, ctx.System));
+            await PrintCommandList(ctx, "members", MemberCommands);
-        // else if (ctx.Match("commands", "help"))
+        else if (await ctx.MatchMember() is PKMember target)
-        //     await PrintCommandList(ctx, "members", MemberCommands);
+            await HandleMemberCommandTargeted(ctx, target);
-        // else if (await ctx.MatchMember() is PKMember target)
+        else if (!ctx.HasNext())
-        //     await HandleMemberCommandTargeted(ctx, target);
+            await PrintCommandExpectedError(ctx, MemberNew, MemberInfo, MemberRename, MemberDisplayName,
-        // else if (!ctx.HasNext())
+                MemberServerName, MemberDesc, MemberPronouns,
-        //     await PrintCommandExpectedError(ctx, MemberNew, MemberInfo, MemberRename, MemberDisplayName,
+                MemberColor, MemberBirthday, MemberProxy, MemberDelete, MemberAvatar);
-        //         MemberServerName, MemberDesc, MemberPronouns,
+        else
-        //         MemberColor, MemberBirthday, MemberProxy, MemberDelete, MemberAvatar);
+            await ctx.Reply($"{Emojis.Error} {ctx.CreateNotFoundError("Member", ctx.PopArgument())}");
-        // else
-        //     await ctx.Reply($"{Emojis.Error} {ctx.CreateNotFoundError("Member", ctx.PopArgument())}");
     }
 
     private async Task HandleMemberCommandTargeted(Context ctx, PKMember target)
     {
         // Commands that have a member target (eg. pk;member <member> delete)
-        if (ctx.Match("rename", "name", "changename", "setname", "rn"))
+        if (ctx.Match("proxy", "tags", "proxytags", "brackets"))
-            await ctx.Execute<MemberEdit>(MemberRename, m => m.Name(ctx, target));
-        else if (ctx.Match("description", "desc", "describe", "d", "bio", "info", "text", "intro"))
-            await ctx.Execute<MemberEdit>(MemberDesc, m => m.Description(ctx, target));
-        else if (ctx.Match("pronouns", "pronoun", "prns", "pn"))
-            await ctx.Execute<MemberEdit>(MemberPronouns, m => m.Pronouns(ctx, target));
-        else if (ctx.Match("color", "colour"))
-            await ctx.Execute<MemberEdit>(MemberColor, m => m.Color(ctx, target));
-        else if (ctx.Match("birthday", "birth", "bday", "birthdate", "cakeday", "bdate", "bd"))
-            await ctx.Execute<MemberEdit>(MemberBirthday, m => m.Birthday(ctx, target));
-        else if (ctx.Match("proxy", "tags", "proxytags", "brackets"))
             await ctx.Execute<MemberProxy>(MemberProxy, m => m.Proxy(ctx, target));
-        else if (ctx.Match("delete", "remove", "destroy", "erase", "yeet"))
-            await ctx.Execute<MemberEdit>(MemberDelete, m => m.Delete(ctx, target));
         else if (ctx.Match("avatar", "profile", "picture", "icon", "image", "pfp", "pic"))
             await ctx.Execute<MemberAvatar>(MemberAvatar, m => m.Avatar(ctx, target));
         else if (ctx.Match("proxyavatar", "proxypfp", "webhookavatar", "webhookpfp", "pa", "pavatar", "ppfp"))
             await ctx.Execute<MemberAvatar>(MemberAvatar, m => m.WebhookAvatar(ctx, target));
-        else if (ctx.Match("banner", "splash", "cover"))
-            await ctx.Execute<MemberEdit>(MemberBannerImage, m => m.BannerImage(ctx, target));
         else if (ctx.Match("group", "groups", "g"))
             if (ctx.Match("add", "a"))
                 await ctx.Execute<GroupMember>(MemberGroupAdd,
@@ -429,27 +448,8 @@ public partial class CommandTree
         else if (ctx.Match("serveravatar", "sa", "servericon", "serverimage", "serverpfp", "serverpic", "savatar", "spic",
                      "guildavatar", "guildpic", "guildicon", "sicon", "spfp"))
             await ctx.Execute<MemberAvatar>(MemberServerAvatar, m => m.ServerAvatar(ctx, target));
-        else if (ctx.Match("displayname", "dn", "dname", "nick", "nickname", "dispname"))
-            await ctx.Execute<MemberEdit>(MemberDisplayName, m => m.DisplayName(ctx, target));
-        else if (ctx.Match("servername", "sn", "sname", "snick", "snickname", "servernick", "servernickname",
-                     "serverdisplayname", "guildname", "guildnick", "guildnickname", "serverdn"))
-            await ctx.Execute<MemberEdit>(MemberServerName, m => m.ServerName(ctx, target));
-        else if (ctx.Match("autoproxy", "ap"))
-            await ctx.Execute<MemberEdit>(MemberAutoproxy, m => m.MemberAutoproxy(ctx, target));
-        else if (ctx.Match("keepproxy", "keeptags", "showtags", "kp"))
-            await ctx.Execute<MemberEdit>(MemberKeepProxy, m => m.KeepProxy(ctx, target));
-        else if (ctx.Match("texttospeech", "text-to-speech", "tts"))
-            await ctx.Execute<MemberEdit>(MemberTts, m => m.Tts(ctx, target));
-        else if (ctx.Match("serverkeepproxy", "servershowtags", "guildshowtags", "guildkeeptags", "serverkeeptags", "skp"))
-            await ctx.Execute<MemberEdit>(MemberServerKeepProxy, m => m.ServerKeepProxy(ctx, target));
         else if (ctx.Match("id"))
             await ctx.Execute<Member>(MemberId, m => m.DisplayId(ctx, target));
-        else if (ctx.Match("privacy"))
-            await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, null));
-        else if (ctx.Match("private", "hidden", "hide"))
-            await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, PrivacyLevel.Private));
-        else if (ctx.Match("public", "shown", "show", "unhide", "unhidden"))
-            await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, PrivacyLevel.Public));
         else
             await PrintCommandNotFoundError(ctx, MemberInfo, MemberRename, MemberDisplayName, MemberServerName,
                 MemberDesc, MemberPronouns, MemberColor, MemberBirthday, MemberProxy, MemberDelete, MemberAvatar,

crates/command_definitions/src/member.rs

@@ -2,31 +2,203 @@ use super::*;
 
 pub fn cmds() -> impl Iterator<Item = Command> {
     let member = ("member", ["m"]);
+    let member_target = tokens!(member, MemberRef);
+
+    let name = ("name", ["n"]);
     let description = ("description", ["desc"]);
+    let pronouns = ("pronouns", ["pronoun", "prns", "pn"]);
     let privacy = ("privacy", ["priv"]);
     let new = ("new", ["n"]);
+    let banner = ("banner", ["bn"]);
+    let color = ("color", ["colour"]);
+    let birthday = ("birthday", ["bday", "bd"]);
+    let display_name = ("displayname", ["dname", "dn"]);
+    let server_name = ("servername", ["sname", "sn"]);
+    let keep_proxy = ("keepproxy", ["kp"]);
+    let server_keep_proxy = ("serverkeepproxy", ["skp"]);
+    let autoproxy = ("autoproxy", ["ap"]);
+    let tts = ("tts", ["texttospeech"]);
+    let delete = ("delete", ["del", "remove"]);
 
-    let member_target = tokens!(member, MemberRef);
+    // Group commands by functionality
-    let member_desc = tokens!(member_target, description);
+    let member_new_cmd = [
-    let member_privacy = tokens!(member_target, privacy);
-
-    [
         command!(member, new, ("name", OpaqueString) => "member_new")
             .help("Creates a new system member"),
+    ].into_iter();
+
+    let member_info_cmd = [
         command!(member_target => "member_show")
             .flag("pt")
             .help("Shows information about a member"),
-        command!(member_desc => "member_desc_show").help("Shows a member's description"),
+    ].into_iter();
-        command!(member_desc, ("description", OpaqueStringRemainder) => "member_desc_update")
+
-            .help("Changes a member's description"),
+    let member_name_cmd = {
-        command!(member_privacy => "member_privacy_show")
+        let member_name = tokens!(member_target, name);
-            .help("Displays a member's current privacy settings"),
+        [
-        command!(
+            command!(member_name => "member_name_show").help("Shows a member's name"),
-            member_privacy, MemberPrivacyTarget, ("new_privacy_level", PrivacyLevel)
+            command!(member_name, ("name", OpaqueStringRemainder) => "member_name_update")
-            => "member_privacy_update"
+                .help("Changes a member's name"),
-        )
+        ].into_iter()
-        .help("Changes a member's privacy settings"),
+    };
+
+    let member_description_cmd = {
+        let member_desc = tokens!(member_target, description);
+        [
+            command!(member_desc => "member_desc_show").help("Shows a member's description"),
+            command!(member_desc, ("clear", ["c"]) => "member_desc_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's description"),
+            command!(member_desc, ("description", OpaqueStringRemainder) => "member_desc_update")
+                .help("Changes a member's description"),
+        ].into_iter()
+    };
+
+    let member_privacy_cmd = {
+        let member_privacy = tokens!(member_target, privacy);
+        [
+            command!(member_privacy => "member_privacy_show")
+                .help("Displays a member's current privacy settings"),
+            command!(
+                member_privacy, MemberPrivacyTarget, ("new_privacy_level", PrivacyLevel)
+                => "member_privacy_update"
+            )
+            .help("Changes a member's privacy settings"),
+        ].into_iter()
+    };
+
+    let member_pronouns_cmd = {
+        let member_pronouns = tokens!(member_target, pronouns);
+        [
+            command!(member_pronouns => "member_pronouns_show")
+                .help("Shows a member's pronouns"),
+            command!(member_pronouns, ("pronouns", OpaqueStringRemainder) => "member_pronouns_update")
+                .help("Changes a member's pronouns"),
+            command!(member_pronouns, ("clear", ["c"]) => "member_pronouns_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's pronouns"),
+        ].into_iter()
+    };
+
+    let member_banner_cmd = {
+        let member_banner = tokens!(member_target, banner);
+        [
+            command!(member_banner => "member_banner_show")
+                .help("Shows a member's banner image"),
+            command!(member_banner, ("banner", Avatar) => "member_banner_update")
+                .help("Changes a member's banner image"),
+            command!(member_banner, ("clear", ["c"]) => "member_banner_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's banner image"),
+        ].into_iter()
+    };
+
+    let member_color_cmd = {
+        let member_color = tokens!(member_target, color);
+        [
+            command!(member_color => "member_color_show")
+                .help("Shows a member's color"),
+            command!(member_color, ("color", OpaqueString) => "member_color_update")
+                .help("Changes a member's color"),
+            command!(member_color, ("clear", ["c"]) => "member_color_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's color"),
+        ].into_iter()
+    };
+
+    let member_birthday_cmd = {
+        let member_birthday = tokens!(member_target, birthday);
+        [
+            command!(member_birthday => "member_birthday_show")
+                .help("Shows a member's birthday"),
+            command!(member_birthday, ("birthday", OpaqueString) => "member_birthday_update")
+                .help("Changes a member's birthday"),
+            command!(member_birthday, ("clear", ["c"]) => "member_birthday_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's birthday"),
+        ].into_iter()
+    };
+
+    let member_display_name_cmd = {
+        let member_display_name = tokens!(member_target, display_name);
+        [
+            command!(member_display_name => "member_displayname_show")
+                .help("Shows a member's display name"),
+            command!(member_display_name, ("name", OpaqueStringRemainder) => "member_displayname_update")
+                .help("Changes a member's display name"),
+            command!(member_display_name, ("clear", ["c"]) => "member_displayname_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's display name"),
+        ].into_iter()
+    };
+
+    let member_server_name_cmd = {
+        let member_server_name = tokens!(member_target, server_name);
+        [
+            command!(member_server_name => "member_servername_show")
+                .help("Shows a member's server name"),
+            command!(member_server_name, ("name", OpaqueStringRemainder) => "member_servername_update")
+                .help("Changes a member's server name"),
+            command!(member_server_name, ("clear", ["c"]) => "member_servername_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's server name"),
+        ].into_iter()
+    };
+
+    let member_proxy_settings_cmd = {
+        let member_keep_proxy = tokens!(member_target, keep_proxy);
+        let member_server_keep_proxy = tokens!(member_target, server_keep_proxy);
+        [
+            command!(member_keep_proxy => "member_keepproxy_show")
+                .help("Shows a member's keep-proxy setting"),
+            command!(member_keep_proxy, ("value", Toggle) => "member_keepproxy_update")
+                .help("Changes a member's keep-proxy setting"),
+            command!(member_server_keep_proxy => "member_server_keepproxy_show")
+                .help("Shows a member's server-specific keep-proxy setting"),
+            command!(member_server_keep_proxy, ("value", Toggle) => "member_server_keepproxy_update")
+                .help("Changes a member's server-specific keep-proxy setting"),
+            command!(member_server_keep_proxy, ("clear", ["c"]) => "member_server_keepproxy_clear")
+                .flag(("yes", ["y"]))
+                .help("Clears a member's server-specific keep-proxy setting"),
+        ].into_iter()
+    };
+
+    let member_message_settings_cmd = {
+        let member_tts = tokens!(member_target, tts);
+        let member_autoproxy = tokens!(member_target, autoproxy);
+        [
+            command!(member_tts => "member_tts_show")
+                .help("Shows whether a member's messages are sent as TTS"),
+            command!(member_tts, ("value", Toggle) => "member_tts_update")
+                .help("Changes whether a member's messages are sent as TTS"),
+            command!(member_autoproxy => "member_autoproxy_show")
+                .help("Shows whether a member can be autoproxied"),
+            command!(member_autoproxy, ("value", Toggle) => "member_autoproxy_update")
+                .help("Changes whether a member can be autoproxied"),
+        ].into_iter()
+    };
+
+    let member_delete_cmd = [
+        command!(member_target, delete => "member_delete")
+            .help("Deletes a member"),
+    ].into_iter();
+
+    let member_easter_eggs = [
         command!(member_target, "soulscream" => "member_soulscream").show_in_suggestions(false),
-    ]
+    ].into_iter();
-    .into_iter()
+
+    member_new_cmd
+        .chain(member_info_cmd)
+        .chain(member_name_cmd)
+        .chain(member_description_cmd)
+        .chain(member_privacy_cmd)
+        .chain(member_pronouns_cmd)
+        .chain(member_banner_cmd)
+        .chain(member_color_cmd)
+        .chain(member_birthday_cmd)
+        .chain(member_display_name_cmd)
+        .chain(member_server_name_cmd)
+        .chain(member_proxy_settings_cmd)
+        .chain(member_message_settings_cmd)
+        .chain(member_delete_cmd)
+        .chain(member_easter_eggs)
 }