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

fix(commands): add separate missing error for Token::Any to relay a better error message to user

Browse source
This commit is contained in:
dusk 2025-01-12 05:35:04 +09:00
parent 8a01d7d37a
commit 58b5a26eca
No known key found for this signature in database
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/commands/src/token.rs
View file

@ -48,6 +48,7 @@ pub enum Token {
#[derive(Debug)]
pub enum TokenMatchError {
MissingParameter { name: ParamName },
MissingAny { tokens: Vec<Token> },
}
#[derive(Debug)]
@ -108,8 +109,9 @@ impl Token {
Some(Err(TokenMatchError::MissingParameter { name: param_name }))
}
Self::Any(tokens) => tokens.is_empty().then_some(None).unwrap_or_else(|| {
let mut results = tokens.iter().map(|t| t.try_match(None));
results.find(|r| !matches!(r, None)).unwrap_or(None)
Some(Err(TokenMatchError::MissingAny {
tokens: tokens.clone(),
}))
}),
// everything else doesnt match if no input anyway
Token::Value(_) => None,