diff --git a/Cargo.lock b/Cargo.lock index e121766..85f12f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -659,7 +659,7 @@ dependencies = [ [[package]] name = "ica-rs" -version = "0.7.1" +version = "0.7.2" dependencies = [ "anyhow", "base64 0.22.1", diff --git a/ica-rs/Cargo.toml b/ica-rs/Cargo.toml index 207c514..089987b 100644 --- a/ica-rs/Cargo.toml +++ b/ica-rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ica-rs" -version = "0.7.1" +version = "0.7.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ica-rs/src/ica/events.rs b/ica-rs/src/ica/events.rs index 3f58140..6ea0d1e 100644 --- a/ica-rs/src/ica/events.rs +++ b/ica-rs/src/ica/events.rs @@ -41,8 +41,9 @@ pub async fn add_message(payload: Payload, client: Client) { send_message(&client, &reply).await; } else if message.content() == "/bot-ls" { let reply = message.reply_with(&format!( - "shenbot-py v{}\n{}", + "shenbot-py v{}-{}\n{}", VERSION, + client_id(), if MainStatus::global_config().check_py() { py::PyStatus::display() } else { @@ -78,7 +79,8 @@ pub async fn add_message(payload: Payload, client: Client) { } } } - } else if message.content().starts_with(&format!("/bot-disable-{}", client_id)) { + } else if message.content().starts_with(&format!("/bot-disable-{}", client_id)) + { if let Some((_, name)) = message.content().split_once(" ") { let path_name = PathBuf::from(name); match py::PyStatus::get_status(&path_name) { diff --git a/ica-rs/src/main.rs b/ica-rs/src/main.rs index 22250c4..93aa435 100644 --- a/ica-rs/src/main.rs +++ b/ica-rs/src/main.rs @@ -1,4 +1,7 @@ -use std::{hash::{DefaultHasher, Hash, Hasher}, time::Duration}; +use std::{ + hash::{DefaultHasher, Hash, Hasher}, + time::Duration, +}; mod config; mod data_struct; @@ -58,9 +61,9 @@ pub fn client_id() -> String { /// 获取版本信息 pub fn version_str() -> String { format!( - "shenbot-rs v{}-{}-[{}] ica v{}({}) tailchat v{}", + "shenbot-rs v{}{}-[{}] ica v{}({}) tailchat v{}", VERSION, - if STABLE { "" } else { "开发版" }, + if STABLE { "" } else { "-开发版" }, client_id(), ICA_VERSION, ica::ICA_PROTOCOL_VERSION, diff --git a/ica-rs/src/tailchat/events.rs b/ica-rs/src/tailchat/events.rs index 2334821..a2a8e65 100644 --- a/ica-rs/src/tailchat/events.rs +++ b/ica-rs/src/tailchat/events.rs @@ -9,7 +9,7 @@ use tracing::{event, info, Level}; use crate::data_struct::tailchat::messages::ReceiveMessage; use crate::data_struct::tailchat::status::{BotStatus, UpdateDMConverse}; use crate::tailchat::client::{emit_join_room, send_message}; -use crate::{client_id, help_msg, py, MainStatus, TAILCHAT_VERSION, VERSION}; +use crate::{client_id, help_msg, py, version_str, MainStatus, VERSION}; /// 所有 pub async fn any_event(event: Event, payload: Payload, _client: Client, _status: Arc) { @@ -78,10 +78,7 @@ pub async fn on_message(payload: Payload, client: Client, _status: Arc