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

refactor(commands): remove help text from command macro and use method to set it

Browse source
This commit is contained in:
dusk 2025-01-20 22:50:45 +09:00
parent 07541d9926
commit c6db96115e
No known key found for this signature in database
6 changed files with 44 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/commands/src/commands.rs
View file

@ -36,11 +36,7 @@ pub struct Command {
}
impl Command {
pub fn new(
tokens: impl IntoIterator<Item = Token>,
help: impl Into<SmolStr>,
cb: impl Into<SmolStr>,
) -> Self {
pub fn new(tokens: impl IntoIterator<Item = Token>, cb: impl Into<SmolStr>) -> Self {
let tokens = tokens.into_iter().collect::<Vec<_>>();
assert!(tokens.len() > 0);
let mut parse_flags_before = tokens.len();
@ -60,7 +56,7 @@ impl Command {
}
Self {
flags: Vec::new(),
help: help.into(),
help: SmolStr::new_static("<no help text>"),
cb: cb.into(),
show_in_suggestions: true,
parse_flags_before,
@ -68,6 +64,11 @@ impl Command {
}
}
pub fn help(mut self, v: impl Into<SmolStr>) -> Self {
self.help = v.into();
self
}
pub fn show_in_suggestions(mut self, v: bool) -> Self {
self.show_in_suggestions = v;
self
@ -111,16 +112,15 @@ impl Display for Command {
// (and something like &dyn Trait would require everything to be referenced which doesnt look nice anyway)
#[macro_export]
macro_rules! command {
([$($v:expr),+], $cb:expr, $help:expr) => {
$crate::commands::Command::new([$(Token::from($v)),*], $help, $cb)
([$($v:expr),+], $cb:expr$(,)*) => {
$crate::commands::Command::new([$(Token::from($v)),*], $cb)
};
}
pub fn all() -> Vec<Command> {
pub fn all() -> impl Iterator<Item = Command> {
(help::cmds())
.chain(system::cmds())
.chain(member::cmds())
.chain(config::cmds())
.chain(fun::cmds())
.collect()
}