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

fix group, member list related commands to work like on prod

Browse source
This commit is contained in:
dusk 2025-11-23 14:46:18 +00:00
parent 6bc39d23fb
commit b3fdaec68c
No known key found for this signature in database
5 changed files with 42 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/command_definitions/src/group.rs
View file

@ -1,11 +1,13 @@
use std::iter::once;
use command_parser::token::TokensIterator;
use crate::utils::get_list_flags;
use super::*;
pub fn group() -> (&'static str, [&'static str; 2]) {
("group", ["g", "groups"])
pub fn group() -> (&'static str, [&'static str; 1]) {
("group", ["g"])
}
pub fn targeted() -> TokensIterator {
@ -151,19 +153,11 @@ pub fn cmds() -> impl Iterator<Item = Command> {
.into_iter();
let apply_list_opts = |cmd: Command| cmd.flags(get_list_flags());
let search_param = Optional(Remainder(("query", OpaqueString)));
let search = tokens!(
("search", ["find", "query"]),
Remainder(("query", OpaqueString))
);
let group_list_members = tokens!(group_target, ("members", ["list", "ls"]));
let group_list_members_cmd = [
command!(group_list_members => "group_list_members"),
command!(group_list_members, "list" => "group_list_members"),
command!(group_list_members, search => "group_search_members"),
]
.into_iter()
.map(apply_list_opts);
let group_list_members_cmd =
once(command!(group_target, ("members", ["list", "ls"]), search_param => "group_members"))
.map(apply_list_opts);
let group_modify_members_cmd = [
command!(group_target, "add", Optional(MemberRefs) => "group_add_member")
@ -173,12 +167,8 @@ pub fn cmds() -> impl Iterator<Item = Command> {
]
.into_iter();
let system_groups_cmd = [
command!(group, ("list", ["ls"]) => "group_list_groups"),
command!(group, search => "group_search_groups"),
]
.into_iter()
.map(apply_list_opts);
let system_groups_cmd =
once(command!(group, ("list", ["ls"]), search_param => "groups_self")).map(apply_list_opts);
system_groups_cmd
.chain(group_new_cmd)