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

partial broken fix for optional parameters (mostly message and reproxy commands)

Browse source
This commit is contained in:
dusk 2025-11-27 00:40:53 +00:00
parent 81e0cebb8e
commit 3c59ad62bd
No known key found for this signature in database
6 changed files with 71 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/command_parser/src/tree.rs
View file

@ -1,6 +1,6 @@
use ordermap::OrderMap;
use crate::{command::Command, token::Token};
use crate::{command::Command, parameter::Skip, token::Token};
#[derive(Debug, Clone)]
pub struct TreeBranch {
@ -21,7 +21,17 @@ impl TreeBranch {
pub fn register_command(&mut self, command: Command) {
let mut current_branch = self;
// iterate over tokens in command
for token in command.tokens.clone() {
for (index, token) in command.tokens.clone().into_iter().enumerate() {
// if the token is an optional parameter, register rest of the tokens to a separate branch
// this allows optional parameters to work if they are not the last token
if matches!(token, Token::Parameter(ref param) if param.is_optional())
&& index < command.tokens.len() - 1
{
current_branch.register_command(Command {
tokens: command.tokens[index + 1..].to_vec(),
..command.clone()
});
}
// recursively get or create a sub-branch for each token
current_branch = current_branch
.branches
@ -36,7 +46,7 @@ impl TreeBranch {
self.current_command.clone()
}
pub fn possible_tokens(&self) -> impl Iterator<Item = &Token> {
pub fn possible_tokens(&self) -> impl Iterator<Item = &Token> + Clone {
self.branches.keys()
}