diff --git a/README.md b/README.md index 9756e5c..0cce8d4 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,6 @@ - [x] 实现基础Sled DB的签到信息记录功能 - [x] 实现matrix机器人收发 - [x] 实现每日签到统计 +- [ ] 实现level自动调整 +- [ ] 实现低level自动踢出(每月签到次数低于7次,且level为铜) - [ ] 实现每月签到统计 \ No newline at end of file diff --git a/daily_state.sled.db/db b/daily_state.sled.db/db index da76b25..03cab51 100644 Binary files a/daily_state.sled.db/db and b/daily_state.sled.db/db differ diff --git a/daily_state.sled.db/snap.0000000000000296 b/daily_state.sled.db/snap.0000000000000296 deleted file mode 100644 index 1914345..0000000 Binary files a/daily_state.sled.db/snap.0000000000000296 and /dev/null differ diff --git a/src/bot/bot_handler.rs b/src/bot/bot_handler.rs index e204b10..e3e983e 100644 --- a/src/bot/bot_handler.rs +++ b/src/bot/bot_handler.rs @@ -3,6 +3,7 @@ use crate::bot::define::{AttendanceHandler, Bot, InboundMessage, MessageEnum, Ou use crate::bot::filters::support_chinese_command; use crate::db::crud_handler; use crate::db::define::StorageEngine; +use crate::db::user_state::{UserLevel, UserState}; use anyhow::{Result, anyhow}; use async_trait::async_trait; use std::path::Path; @@ -140,8 +141,68 @@ async fn start_bot_command_processor( let argus = &ast.arguments; match argus.iter().next() { - Some(a) => match *a { - //TODO:完成设置用户等级的功能 + Some(a) => match a.as_str() { + "set" => { + let user_id = argus.iter().nth(1).ok_or_else(|| { + anyhow!("请提供用户ID参数,例如:!level set @123:matrix.org super") + })?; + let level = argus.iter().nth(2).ok_or_else(|| { + anyhow!("请提供等级参数,例如:!level set @123:matrix.org super") + })?; + crud_handler + .set_user_level( + user_id, + UserLevel::from_str(level) + .ok_or_else(|| anyhow!("无效的等级参数"))?, + ) + .await?; + let outbound = OutboundMessage { + channel_id: inbound.channel_id.clone(), + text: format!("已设置用户 {} 的等级为 {}", user_id, level), + reply_to_event_id: Some(inbound.event_id.clone()), + }; + bot.send_raw_message(&outbound.channel_id, &outbound) + .await?; + } + "raise" => { + let user_id = argus.iter().nth(1).ok_or_else(|| { + anyhow!("请提供用户ID参数,例如:!level raise @123:matrix.org") + })?; + crud_handler.raise_level(user_id).await?; + let outbound = OutboundMessage { + channel_id: inbound.channel_id.clone(), + text: format!("已提升用户 {} 的等级", user_id), + reply_to_event_id: Some(inbound.event_id.clone()), + }; + bot.send_raw_message(&outbound.channel_id, &outbound) + .await?; + } + "super" => { + let user_id = argus.iter().nth(1).ok_or_else(|| { + anyhow!("请提供用户ID参数,例如:!level super @123:matrix.org") + })?; + crud_handler.give_super(user_id).await?; + let outbound = OutboundMessage { + channel_id: inbound.channel_id.clone(), + text: format!("已赋予用户 {} 超级权限", user_id), + reply_to_event_id: Some(inbound.event_id.clone()), + }; + bot.send_raw_message(&outbound.channel_id, &outbound) + .await?; + } + "clear" => { + let user_id = argus.iter().nth(1).ok_or_else(|| { + anyhow!("请提供用户ID参数,例如:!level clear @123:matrix.org") + })?; + crud_handler.clean_user_level(user_id).await?; + let outbound = OutboundMessage { + channel_id: inbound.channel_id.clone(), + text: format!("已清除用户 {} 的等级为默认等级", user_id), + reply_to_event_id: Some(inbound.event_id.clone()), + }; + bot.send_raw_message(&outbound.channel_id, &outbound) + .await?; + } _ => {} }, None => { diff --git a/src/bot/filters.rs b/src/bot/filters.rs index 7675c78..4016da8 100644 --- a/src/bot/filters.rs +++ b/src/bot/filters.rs @@ -1,6 +1,8 @@ // filters: Option MessageEnum + Send + Sync>>>, use crate::bot::define::InboundMessage; + + //支持中文指令 pub fn support_chinese_command(msg: &InboundMessage) -> InboundMessage { //支持中文指令的简单实现,可以根据需要扩展 @@ -18,3 +20,7 @@ pub fn support_chinese_command(msg: &InboundMessage) -> InboundMessage { //pub fn support_chinese_command(msg: &InboundMessage) -> InboundMessage { // unimplemented!() //} + + + + diff --git a/src/bot/matrix.rs b/src/bot/matrix.rs index 8f7e980..03ad8ae 100644 --- a/src/bot/matrix.rs +++ b/src/bot/matrix.rs @@ -1,10 +1,12 @@ use anyhow::{Result, anyhow}; use matrix_sdk::{ Client, Room, - config::SyncSettings, + config::{self, SyncSettings}, ruma::{ OwnedUserId, RoomId, UserId, - events::room::message::{MessageType, OriginalSyncRoomMessageEvent}, + events::room::message::{ + MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent, + }, }, }; use std::{sync::Arc, time::Duration}; @@ -12,7 +14,7 @@ use std::{sync::Arc, time::Duration}; use crate::{ bot::{bot_handler::ChannelManager, define::Bot}, config::{Config, RoomType}, - db::{define::StorageEngine, user_state::UserState}, + db::{define::StorageEngine, filter::super_filter, user_state::UserState}, }; #[derive(Debug, Clone)] @@ -112,11 +114,34 @@ impl Bot for MatrixBot { ) .await .map_err(|e| anyhow!("Matrix 登录重试失败: {}", e))?; - tokio::spawn(async move {}); Ok(()) } async fn join_rooms(&self) -> Result<()> { - for _room in &self.config.rooms {} + let config = Config::get_all(); + let client = Arc::clone(&self.client); + let mut rooms = client.joined_rooms(); + let room = client + .join_room_by_id( + config + .matrix + .clone() + .unwrap() + .rooms + .get(0) + .unwrap() + .room_id + .as_ref(), + ) + .await + .unwrap(); + rooms.push(room); + for room in &rooms { + let content = RoomMessageEventContent::text_plain("机器人已启动".to_string()); + tokio::time::timeout(Duration::from_secs(20), room.send(content)) + .await + .expect("room.send() 超时,可能卡在 Matrix 发送请求") + .unwrap(); + } Ok(()) } async fn send_raw_message( @@ -172,6 +197,13 @@ impl Bot for MatrixBot { let user_id = user.to_string(); if let Some(state) = db.get_raw(&user_id.as_bytes()).await? { let state = serde_json::from_slice::(&state)?; + if state.is_checkin_today { + continue; // 已经签到的用户不算未签到 + } + + if super_filter(&state) { + continue; // 根据过滤条件过滤用户 + } let checkin_ms = i64::try_from(state.checkin_unix_mills).unwrap_or(i64::MAX); let unchecked_ms = now.timestamp_millis().saturating_sub(checkin_ms); let current_ms = now.timestamp_millis(); diff --git a/src/bot/schedule.rs b/src/bot/schedule.rs index bed6046..46a629d 100644 --- a/src/bot/schedule.rs +++ b/src/bot/schedule.rs @@ -70,6 +70,10 @@ impl ScheduleHandler { ); log::info!("[daily_report] load_all_user_state: begin"); let states = db.get_all_user_state().await?; + let states = states + .iter() + .filter(|(_, state)| !crate::db::filter::super_filter(state)) + .collect::>(); log::info!( "[daily_report] load_all_user_state: done, state_count={}", states.len() @@ -112,6 +116,7 @@ impl ScheduleHandler { .await? .into_iter() .filter(|(_, state)| !state.is_checkin_today) + .filter(|(_, state)| !crate::db::filter::super_filter(state)) .map(|(user_id, _)| user_id) .collect::>() .join(" ,\n"); diff --git a/src/db/crud_handler.rs b/src/db/crud_handler.rs index 95d3917..4a1c0db 100644 --- a/src/db/crud_handler.rs +++ b/src/db/crud_handler.rs @@ -1,6 +1,5 @@ use crate::db::{self, define::StorageEngine}; use anyhow::{Ok, Result, anyhow}; -use chrono::naive::serde; pub struct CrudHandler { pub engine: T, } @@ -12,7 +11,11 @@ impl CrudHandler { pub async fn checkin(&self, user_id: &str) -> Result<()> { let key = user_id.as_bytes(); - let mut value = db::user_state::UserState::new(); + let mut value = if let Some(value_bytes) = self.engine.get_raw(key).await? { + serde_json::from_slice::(&value_bytes)? + } else { + db::user_state::UserState::new() + }; value.checkin(); let value_bytes = serde_json::to_vec(&value)?; @@ -50,7 +53,11 @@ impl CrudHandler { level: db::user_state::UserLevel, ) -> Result<()> { let key = user_id.as_bytes(); - let mut value = db::user_state::UserState::new(); + let mut value = if let Some(value_bytes) = self.engine.get_raw(key).await? { + serde_json::from_slice::(&value_bytes)? + } else { + db::user_state::UserState::new() + }; value.level = level; let value_bytes = serde_json::to_vec(&value)?; @@ -60,7 +67,11 @@ impl CrudHandler { pub async fn give_super(&self, user_id: &str) -> Result<()> { let key = user_id.as_bytes(); - let mut value = db::user_state::UserState::new(); + let mut value = if let Some(value_bytes) = self.engine.get_raw(key).await? { + serde_json::from_slice::(&value_bytes)? + } else { + db::user_state::UserState::new() + }; value.level = db::user_state::UserLevel::Super; let value_bytes = serde_json::to_vec(&value)?; @@ -70,7 +81,11 @@ impl CrudHandler { pub async fn clean_user_level(&self, user_id: &str) -> Result<()> { let key = user_id.as_bytes(); - let mut value = db::user_state::UserState::new(); + let mut value = if let Some(value_bytes) = self.engine.get_raw(key).await? { + serde_json::from_slice::(&value_bytes)? + } else { + db::user_state::UserState::new() + }; value.level = db::user_state::UserLevel::Bronze; let value_bytes = serde_json::to_vec(&value)?; diff --git a/src/db/filter.rs b/src/db/filter.rs new file mode 100644 index 0000000..f7a9578 --- /dev/null +++ b/src/db/filter.rs @@ -0,0 +1,11 @@ +use crate::db::user_state::UserState; + +//fn temple_filter(state: UserState) -> bool {} + +// 过滤掉超级用户,其他用户都不过滤 +pub fn super_filter(state: &UserState) -> bool { + if state.level == crate::db::user_state::UserLevel::Super { + return true; + } + false +} diff --git a/src/db/mod.rs b/src/db/mod.rs index 6db81f2..4b21d29 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -1,4 +1,5 @@ pub mod crud_handler; pub mod define; +pub mod filter; pub mod sled_db; pub mod user_state; diff --git a/src/db/user_state.rs b/src/db/user_state.rs index ad5d8c4..54967f5 100644 --- a/src/db/user_state.rs +++ b/src/db/user_state.rs @@ -21,7 +21,7 @@ pub enum UserLevel { } impl Default for UserLevel { fn default() -> Self { - UserLevel::Bronze + UserLevel::Silver } } @@ -32,6 +32,31 @@ value:UserState的json字符串 */ +impl UserLevel { + pub fn to_str(&self) -> &'static str { + match self { + UserLevel::Super => "Super", + UserLevel::Bronze => "Bronze", + UserLevel::Silver => "Silver", + UserLevel::Gold => "Gold", + UserLevel::Platinum => "Platinum", + UserLevel::Diamond => "Diamond", + } + } + + pub fn from_str(s: &str) -> Option { + match s { + "Super" => Some(UserLevel::Super), + "Bronze" => Some(UserLevel::Bronze), + "Silver" => Some(UserLevel::Silver), + "Gold" => Some(UserLevel::Gold), + "Platinum" => Some(UserLevel::Platinum), + "Diamond" => Some(UserLevel::Diamond), + _ => None, + } + } +} + impl UserState { pub fn new() -> Self { Self { @@ -39,7 +64,7 @@ impl UserState { checkin_unix_mills: 0 as u64, checkin_times_in_month: 0, checkin_days: Vec::new(), - level: UserLevel::Bronze, + level: UserLevel::Silver, } } @@ -53,11 +78,14 @@ impl UserState { if !self.checkin_days.contains(&day) { self.checkin_days.push(day); } + if self.level == UserLevel::Super { + return; + } match self.checkin_times_in_month { - 0..=14 => self.level = UserLevel::Bronze, - 15..=30 => self.level = UserLevel::Silver, - 31..=45 => self.level = UserLevel::Gold, - 46..=60 => self.level = UserLevel::Platinum, + 0..=7 => self.level = UserLevel::Bronze, + 8..=14 => self.level = UserLevel::Silver, + 15..=29 => self.level = UserLevel::Gold, + 30..=44 => self.level = UserLevel::Platinum, _ => self.level = UserLevel::Diamond, } } diff --git a/src/main.rs b/src/main.rs index 38ab7ce..b68185c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,6 +29,7 @@ async fn main() -> anyhow::Result<()> { schedule_handler .add_daily_statistics_and_report_schedule(bot_clone, "* * 3 * * *") .await?; + log::info!("Bot is running. Press Ctrl+C to stop."); tokio::signal::ctrl_c().await?; // 等待 Ctrl+C 信号以优雅地关闭应用程序。 let stop_tx = CommandHandler::global_sender();