GeneralBots/generalbots
2
1
Fork 0
Code Activity Actions 5

fix: ADD_SWITCHER keyword syntax - special handling for 'as' keyword format
All checks were successful
Botlib CI / build (push) Successful in 7s
Details
Bottest CI / build (push) Successful in 31s
Details
BotUI CI / build (push) Successful in 18s
Details

Browse source 
The ADD_SWITCHER keyword was generating comma-separated params (ADD_SWITCHER(id, label))
instead of the expected Rhai custom syntax (ADD_SWITCHER id as label).

This fix adds special handling in the multiword processor to output the correct
format when processing ADD_SWITCHER with 2 parameters.

Fixes #495
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-24 18:53:20 +00:00
parent 3048832a2d
commit 9f7da0a291
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
botserver/src/basic/mod.rs
View file

@ -1382,19 +1382,25 @@ pub fn convert_keywords_to_lowercase(script: &str) -> String {
let params = Self::parse_parameters(params_str.as_str());
let param_count = params.len();
// Validate parameter count
if param_count >= *min_params && param_count <= *max_params {
// Convert keyword to underscores
let keyword = pattern.replace(r"\s+", "_");
// Validate parameter count
if param_count >= *min_params && param_count <= *max_params {
// Convert keyword to underscores
let keyword = pattern.replace(r"\s+", "_");
// Build function call
let params_str = if params.is_empty() {
String::new()
} else {
params.join(", ")
};
// Build function call
// Special handling for ADD_SWITCHER which uses "as" syntax
let output = if keyword == "ADD_SWITCHER" && params.len() == 2 {
format!("ADD_SWITCHER {} as {};", params[0], params[1])
} else {
let params_str = if params.is_empty() {
String::new()
} else {
params.join(", ")
};
format!("{}({});", keyword, params_str)
};
result.push_str(&format!("{}({});", keyword, params_str));
result.push_str(&output);
result.push('\n');
converted = true;
break;