Func: anti nickname censorship

Author: Xerxes-2

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "majsoul_max_rs"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2021"
 
 [lib]

Cargo.toml

@@ -119,6 +119,7 @@
   ],
   "presetIndex": 0,
   "showServer": 1,
+  "antiNicknameCensorship": 1,
   "autoUpdate": 1,
   "version": "v0.11.43.w",
   "verified": 2

liqi_config/settings.mod.json

@@ -351,12 +351,24 @@ impl Modder {
                 }
                 modified_data = Some(msg.encode_to_vec());
             }
+            ".lq.Lobby.fetchServerSettings" => {
+                let mut msg = lq::ResServerSettings::decode(msg_block.data.as_ref())?;
+                if MOD_SETTINGS.read().await.anti_nickname_censorship() {
+                    if let Some(ref mut settings) = msg.settings {
+                        if let Some(ref mut nick_setting) = settings.nickname_setting {
+                            nick_setting.enable = 0;
+                            nick_setting.nicknames.clear();
+                            modified_data = Some(msg.encode_to_vec());
+                        }
+                    }
+                }
+            }
             _ => {}
         }
         if let Some(data) = modified_data {
             info!("Respond method: {}", method_name);
             msg_block.data = data;
-            let mut buf = vec![buf[0], buf[1], buf[2]];
+            let mut buf = buf[..3].to_vec();
             buf.extend(msg_block.encode_to_vec());
             Ok(ModifyResult {
                 msg: Some(buf),
@@ -575,7 +587,7 @@ impl Modder {
             };
             msg_block.method_name = ".lq.Lobby.loginBeat".to_string();
             msg_block.data = data.encode_to_vec();
-            let mut buf = vec![buf[0], buf[1], buf[2]];
+            let mut buf = buf[..3].to_vec();
             buf.extend(msg_block.encode_to_vec());
             Ok(ModifyResult {
                 msg: Some(buf),
@@ -645,6 +657,18 @@ impl Modder {
                 }
                 modified_data = Some(msg.encode_to_vec());
             }
+            ".lq.NotifyCustomContestSystemMsg" => {
+                if MOD_SETTINGS.read().await.show_server() {
+                    let mut msg =
+                        lq::NotifyCustomContestSystemMsg::decode(msg_block.data.as_ref())?;
+                    if let Some(ref mut game) = msg.game_start {
+                        game.players.iter_mut().for_each(|p| {
+                            p.nickname = add_zone_id(p.account_id, &p.nickname);
+                        });
+                        modified_data = Some(msg.encode_to_vec());
+                    }
+                }
+            }
             _ => {}
         }
         if let Some(data) = modified_data {
@@ -667,9 +691,10 @@ impl Modder {
 }
 
 fn add_zone_id(id: u32, name: &str) -> String {
+    const CN: &str = "[C\u{feff}N]";
     let zone_code = id >> 23;
     let zone = match zone_code {
-        code if code <= 6 => "[CN]",
+        code if code <= 6 => CN,
         code if (7..=12).contains(&code) => "[JP]",
         code if (13..=15).contains(&code) => "[EN]",
         _ => "[??]",

src/modder.rs

@@ -12,22 +12,15 @@ use std::{
 use tracing::info;
 
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct Settings {
-    #[serde(rename = "sendMethod")]
     pub send_method: Vec<String>,
-    #[serde(rename = "sendAction")]
     pub send_action: Vec<String>,
-    #[serde(rename = "proxyAddr")]
     pub proxy_addr: String,
-    #[serde(rename = "apiUrl")]
     pub api_url: String,
-    #[serde(rename = "helperSwitch")]
     helper_switch: i32,
-    #[serde(rename = "modSwitch")]
     mod_switch: i32,
-    #[serde(rename = "autoUpdate")]
     auto_update: i32,
-    #[serde(rename = "liqiVersion")]
     liqi_version: String,
     #[serde(skip)]
     methods_set: HashSet<String>,
@@ -235,32 +228,21 @@ pub async fn get_lqbin_prefix(version: &str) -> Result<String> {
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct ModSettings {
-    #[serde(rename = "mainChar")]
     pub main_char: u32,
-    #[serde(rename = "charSkin")]
     pub char_skin: HashMap<u32, u32>,
-    #[serde(default)]
     pub nickname: String,
-    #[serde(rename = "starCharacter")]
     pub star_character: Vec<u32>,
-    #[serde(rename = "hintSwitch")]
     hint_switch: i32,
-    #[serde(default)]
     pub title: u32,
-    #[serde(rename = "loadingBg")]
     pub loading_bg: Vec<u32>,
-    #[serde(rename = "emojiSwitch")]
     emoji_switch: i32,
-    #[serde(rename = "viewsPresets")]
     pub views_presets: [Vec<ViewSlot>; 10],
-    #[serde(rename = "presetIndex")]
     pub preset_index: u32,
-    #[serde(rename = "showServer")]
     show_server: i32,
-    #[serde(rename = "autoUpdate")]
+    anti_nickname_censorship: i32,
     auto_update: i32,
-    #[serde(default)]
     version: String,
     pub verified: u32,
     #[serde(skip)]
@@ -281,6 +263,7 @@ impl Default for ModSettings {
             views_presets: Default::default(),
             preset_index: 0,
             show_server: 1,
+            anti_nickname_censorship: 1,
             auto_update: 1,
             verified: 0,
             version: String::new(),
@@ -327,6 +310,10 @@ impl ModSettings {
         self.auto_update != 0
     }
 
+    pub fn anti_nickname_censorship(&self) -> bool {
+        self.anti_nickname_censorship != 0
+    }
+
     pub async fn get_lqc(&mut self) -> Result<bool> {
         // get lqc.lqbin prefix from https://game.maj-soul.com/1/{prefix}/res/config/lqc.lqbin
         let version = get_version().await?;