From 4eb5c1d5e721c81df620ddaebc3bbeff59e3dbe1 Mon Sep 17 00:00:00 2001 From: DJMrTV Date: Fri, 14 Feb 2025 10:08:45 +0100 Subject: [PATCH] feat(bot): add cheseburger and update error-codes --- .gitmodules | 1 + build.rs | 23 ++++++++++++++++------- error-codes | 2 +- src/error_codes.rs | 9 ++++++++- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index a37a39b..a0e913d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "error-codes"] path = error-codes url = https://github.com/AToska21/error-codes.git + branch = dev diff --git a/build.rs b/build.rs index de2a671..7384d08 100644 --- a/build.rs +++ b/build.rs @@ -24,6 +24,8 @@ struct ErrorInfo{ } fn main(){ + println!("cargo:rerun-if-changed=./error-codes"); + let mut code = "pub fn get_error_code_and_category(category: u16, code: u16) -> (super::CategoryInfo, super::ErrorInfo) {\ let category_result = match category{\ ".to_owned(); @@ -135,43 +137,50 @@ fn main(){ panic!("unable to parse error json"); }; - let name = name.replace("\"", "\\\""); + let name = name.replace("\"", "\\\"") + .replace("\\n", "\n"); let Value::String(message) = &error["message"] else { panic!("unable to parse error json"); }; - let message = message.replace("\"", "\\\""); + let message = message.replace("\"", "\\\"") + .replace("\\n", "\n"); let Value::String(short_description) = &error["short_description"] else { panic!("unable to parse error json"); }; - let short_description = short_description.replace("\"", "\\\""); + let short_description = short_description.replace("\"", "\\\"") + .replace("\\n", "\n"); let Value::String(long_description) = &error["long_description"] else { panic!("unable to parse error json"); }; - let long_description = long_description.replace("\"", "\\\""); + let long_description = long_description.replace("\"", "\\\"") + .replace("\\n", "\n"); let Value::String(short_solution) = &error["short_solution"] else { panic!("unable to parse error json"); }; - let short_solution = short_solution.replace("\"", "\\\""); + let short_solution = short_solution.replace("\"", "\\\"") + .replace("\\n", "\n"); let Value::String(long_solution) = &error["long_solution"] else { panic!("unable to parse error json"); }; - let long_solution = long_solution.replace("\"", "\\\""); + let long_solution = long_solution.replace("\"", "\\\"") + .replace("\\n", "\n"); let Value::String(support_link) = &error["support_link"] else { panic!("unable to parse error json"); }; - let support_link = support_link.replace("\"", "\\\""); + let support_link = support_link.replace("\"", "\\\"") + .replace("\\n", "\n"); code.write_str( &format!("\ diff --git a/error-codes b/error-codes index 2902808..3de15cd 160000 --- a/error-codes +++ b/error-codes @@ -1 +1 @@ -Subproject commit 2902808d5c80fd8bf6afcf198949c861199b987d +Subproject commit 3de15cd5481f815c509cfe606b4f3416589b4a2c diff --git a/src/error_codes.rs b/src/error_codes.rs index 1a752cf..905481d 100644 --- a/src/error_codes.rs +++ b/src/error_codes.rs @@ -55,6 +55,9 @@ impl Default for ErrorInfo{ static ERROR_CODE_REGEX: Lazy = Lazy::new(|| Regex::new("\\d\\d\\d-\\d\\d\\d\\d").expect("invalid regex")); +static CHEESEBURGER_REGEX: Lazy = + Lazy::new(|| Regex::new("[Cc]heeseburger(s)?").expect("invalid regex")); + pub struct ErrorCodeHandler; fn create_error_explain_message(str_code: &str, expanded: bool) -> Option{ @@ -76,7 +79,7 @@ fn create_error_explain_message(str_code: &str, expanded: bool) -> Option