应该可以跑了,还没完全测试
This commit is contained in:
1 parent
7096384161
commit
9dbd544b47
11 files changed
+263
-76
No files matched your search
@@ -132,6 +132,8 @@ async fn start_bot_command_processor(
|
||||
bot.send_raw_message(&outbound.channel_id, &outbound)
|
||||
.await?;
|
||||
}
|
||||
|
||||
"test_report" => {}
|
||||
_ => {
|
||||
return Err(anyhow!("unknown command: {}", command));
|
||||
}
|
||||
@@ -219,7 +221,7 @@ impl AttendanceHandler for CommandHandler {
|
||||
mod tests {
|
||||
use super::start_bot_command_processor;
|
||||
use crate::bot::define::{Bot, InboundMessage, OutboundMessage};
|
||||
use anyhow::Result;
|
||||
use anyhow::{Ok, Result};
|
||||
use async_trait::async_trait;
|
||||
use std::sync::Mutex;
|
||||
|
||||
@@ -240,6 +242,12 @@ mod tests {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn get_users_who_unchecked_for_long_time(
|
||||
&self,
|
||||
) -> Result<Vec<(String, Option<usize>)>> {
|
||||
Ok(vec![("@user1:example.org".to_string(), Some(100))])
|
||||
}
|
||||
|
||||
async fn join_rooms(&self) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -51,4 +51,5 @@ pub trait Bot {
|
||||
async fn join_rooms(&self) -> Result<()>;
|
||||
async fn send_raw_message(&self, room_id: &str, message: &OutboundMessage) -> Result<String>;
|
||||
async fn get_users_count(&self, room_id: &str) -> Result<usize>;
|
||||
async fn get_users_who_unchecked_for_long_time(&self) -> Result<Vec<(String, Option<usize>)>>;
|
||||
}
|
||||
+44
-4
@@ -11,9 +11,11 @@ use std::{sync::Arc, time::Duration};
|
||||
|
||||
use crate::{
|
||||
bot::{bot_handler::ChannelManager, define::Bot},
|
||||
config::Config,
|
||||
config::{Config, RoomType},
|
||||
db::{define::StorageEngine, user_state::UserState},
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct MatrixBot {
|
||||
pub client: Arc<Client>,
|
||||
pub user_id: OwnedUserId,
|
||||
@@ -122,9 +124,10 @@ impl Bot for MatrixBot {
|
||||
room_id: &str,
|
||||
message: &crate::bot::define::OutboundMessage,
|
||||
) -> Result<String> {
|
||||
let content = matrix_sdk::ruma::events::room::message::RoomMessageEventContent::text_plain(
|
||||
message.text.clone(),
|
||||
);
|
||||
let content =
|
||||
matrix_sdk::ruma::events::room::message::RoomMessageEventContent::text_markdown(
|
||||
message.text.clone(),
|
||||
);
|
||||
let room_id = RoomId::parse(room_id)?;
|
||||
let room = self
|
||||
.client
|
||||
@@ -144,6 +147,43 @@ impl Bot for MatrixBot {
|
||||
let members = room.joined_members_count();
|
||||
Ok(members as usize)
|
||||
}
|
||||
async fn get_users_who_unchecked_for_long_time(&self) -> Result<Vec<(String, Option<usize>)>> {
|
||||
let db_path = std::path::Path::new("daily_state.sled.db");
|
||||
let db = crate::db::sled_db::SledDB::new(db_path)?;
|
||||
let mut result = Vec::new();
|
||||
let main_room = self
|
||||
.config
|
||||
.rooms
|
||||
.iter()
|
||||
.filter(|r| r.room_type == RoomType::MainRoom)
|
||||
.next()
|
||||
.clone()
|
||||
.unwrap();
|
||||
let main_room = self
|
||||
.client
|
||||
.get_room(&main_room.room_id)
|
||||
.expect("主房间应该存在,但是并未存在");
|
||||
|
||||
let users = main_room.joined_user_ids().await?;
|
||||
let now = chrono::Utc::now()
|
||||
.to_utc()
|
||||
.with_timezone(&chrono_tz::Asia::Shanghai); //UTC时间转换为北京时间
|
||||
for user in users {
|
||||
let user_id = user.to_string();
|
||||
if let Some(state) = db.get_raw(&user_id.as_bytes()).await? {
|
||||
let state = serde_json::from_slice::<UserState>(&state)?;
|
||||
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 unchecked_days = chrono::Duration::try_milliseconds(unchecked_ms)
|
||||
.map(|d| d.num_days())
|
||||
.unwrap_or(0);
|
||||
result.push((user_id, Some(unchecked_days as usize)));
|
||||
} else {
|
||||
result.push((user_id, None));
|
||||
}
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
+125
-11
@@ -1,14 +1,18 @@
|
||||
use std::ops::Add;
|
||||
use std::{ops::Add, sync::Arc};
|
||||
|
||||
use anyhow::{Ok, Result};
|
||||
use chrono::NaiveDate;
|
||||
use log::info;
|
||||
use tokio_cron_scheduler::Job;
|
||||
|
||||
use crate::{config::Config, db};
|
||||
use crate::{
|
||||
bot::define::{Bot, OutboundMessage},
|
||||
config::{Config, RoomType},
|
||||
db,
|
||||
};
|
||||
pub struct ScheduleHandler {
|
||||
sche: tokio_cron_scheduler::JobScheduler, //这里可以添加一些定时任务相关的字段,比如定时器,任务列表等
|
||||
}
|
||||
|
||||
type SharedBot = Arc<dyn Bot + Send + Sync>;
|
||||
impl ScheduleHandler {
|
||||
//new新实例后会自动启动定时任务,所以不需要单独调用start方法
|
||||
pub async fn new() -> Self {
|
||||
@@ -24,17 +28,32 @@ impl ScheduleHandler {
|
||||
//这里可以启动定时任务,比如使用tokio的定时器,或者其他的定时任务库
|
||||
info!("定时任务已启动");
|
||||
self.sche.start().await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn add_daily_statistics_and_report_schedule(
|
||||
&self,
|
||||
bot: impl crate::bot::define::Bot + Send + Sync + 'static,
|
||||
|
||||
bot: SharedBot,
|
||||
cron: impl AsRef<str>,
|
||||
) -> Result<()> {
|
||||
let cron = cron.as_ref();
|
||||
let cron: &str = cron.as_ref();
|
||||
self.sche
|
||||
.add(Job::new_async(cron, move |uuid, _l| {
|
||||
let bot = bot.clone();
|
||||
Box::pin(async move {
|
||||
log::info!("异步任务执行了,ID: {:?}", uuid);
|
||||
|
||||
if let Err(err) =
|
||||
ScheduleHandler::daily_statistics_and_report_schedule(bot).await
|
||||
{
|
||||
log::error!("每日统计任务执行失败: {}", err);
|
||||
}
|
||||
})
|
||||
})?)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
pub async fn daily_statistics_and_report_schedule(bot: SharedBot) -> Result<()> {
|
||||
//获取和转换日期
|
||||
let date = chrono::Local::now()
|
||||
.naive_local()
|
||||
@@ -49,14 +68,109 @@ impl ScheduleHandler {
|
||||
let states = db.get_all_user_state().await?;
|
||||
|
||||
let checked_nums = states.len();
|
||||
//TODO:完成此函数,重点是获取全部人数,最好低耦合
|
||||
let md_reply = r#"
|
||||
let config = Config::get_all().clone();
|
||||
//TODO:这里只能作为Matrix的签到统计,后续可以改成更通用的签到统计,或者直接在数据库里存储签到状态,这样就不需要获取全部状态了,可以考虑增加一个Bot trait的方法来获取签到人数,这样就可以更低耦合的实现签到统计
|
||||
let main_room_id = config
|
||||
.matrix
|
||||
.unwrap()
|
||||
.rooms
|
||||
.iter()
|
||||
.filter(|r| r.room_type == RoomType::MainRoom)
|
||||
.next()
|
||||
.expect("应该有一个主房间,但是配置文件未提供")
|
||||
.clone();
|
||||
let all_user_nums = bot.get_users_count(main_room_id.room_id.as_str()).await?;
|
||||
|
||||
let unchecked_nums = all_user_nums - checked_nums;
|
||||
let checkin_rate = (checked_nums as f64 / all_user_nums as f64 * 100.0).round() as u32;
|
||||
let users_table = bot.get_users_who_unchecked_for_long_time().await?;
|
||||
let today_unchecked_users = db
|
||||
.get_all_user_state()
|
||||
.await?
|
||||
.into_iter()
|
||||
.filter(|(_, state)| !state.is_checkin_today)
|
||||
.map(|(user_id, _)| user_id)
|
||||
.collect::<Vec<String>>()
|
||||
.join(" ,\n");
|
||||
let above_7days_unchecked_users = users_table
|
||||
.iter()
|
||||
.filter(|(_, unchecked_days)| {
|
||||
if let Some(days) = unchecked_days {
|
||||
*days >= 7
|
||||
} else {
|
||||
false
|
||||
}
|
||||
})
|
||||
.map(|(user_id, _)| user_id.clone())
|
||||
.collect::<Vec<String>>()
|
||||
.join(" ,\n");
|
||||
let above_14days_unchecked_users = users_table
|
||||
.iter()
|
||||
.filter(|(_, unchecked_days)| {
|
||||
if let Some(days) = unchecked_days {
|
||||
*days >= 14
|
||||
} else {
|
||||
false
|
||||
}
|
||||
})
|
||||
.map(|(user_id, _)| user_id.clone())
|
||||
.collect::<Vec<String>>()
|
||||
.join(" ,\n");
|
||||
let above_30days_unchecked_users = users_table
|
||||
.iter()
|
||||
.filter(|(_, unchecked_days)| {
|
||||
if let Some(days) = unchecked_days {
|
||||
*days >= 30
|
||||
} else {
|
||||
false
|
||||
}
|
||||
})
|
||||
.map(|(user_id, _)| user_id.clone())
|
||||
.collect::<Vec<String>>()
|
||||
.join(" ,\n");
|
||||
|
||||
let always_unchecked_users = users_table
|
||||
.iter()
|
||||
.filter(|(_, unchecked_days)| unchecked_days.is_none())
|
||||
.map(|(user_id, _)| user_id.clone())
|
||||
.collect::<Vec<String>>()
|
||||
.join(" ,\n");
|
||||
let md_reply = format!(
|
||||
r#"
|
||||
# {date}签到统计报告
|
||||
- 今日签到人数:{checked_nums}
|
||||
- 全部人数:{all_user_nums}
|
||||
- 未签到人数:{unchecked_nums}
|
||||
- 签到率:{checkin_rate}%
|
||||
|
||||
## 今日未签到用户
|
||||
{today_unchecked_users}
|
||||
|
||||
"#; //每日统计报告
|
||||
## 超过7天未签到用户
|
||||
{above_7days_unchecked_users}
|
||||
|
||||
## 超过14天未签到用户
|
||||
{above_14days_unchecked_users}
|
||||
|
||||
## 超过30天未签到用户
|
||||
{above_30days_unchecked_users}
|
||||
|
||||
## 从未签到用户
|
||||
{always_unchecked_users}
|
||||
|
||||
"#
|
||||
); //每日统计报告
|
||||
|
||||
bot.send_raw_message(
|
||||
main_room_id.room_id.as_str(),
|
||||
&OutboundMessage {
|
||||
channel_id: main_room_id.room_id.to_string(),
|
||||
text: md_reply,
|
||||
reply_to_event_id: None,
|
||||
},
|
||||
)
|
||||
.await?;
|
||||
db.reset_all_user_daily_state().await?; //重置每日签到状态
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -10,7 +10,7 @@ fn get_config() -> &'static Config {
|
||||
})
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct Config {
|
||||
pub matrix: Option<MatrixBot>,
|
||||
}
|
||||
@@ -22,7 +22,7 @@ pub struct MatrixBot {
|
||||
pub password: String,
|
||||
pub rooms: Vec<Room>,
|
||||
}
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, PartialOrd, Ord, Eq)]
|
||||
pub enum RoomType {
|
||||
MainRoom, //主房间,用于签到和汇报
|
||||
SubRoom, //子房间,用于自动踢出,统计(默认)
|
||||
@@ -33,7 +33,7 @@ fn default_room_type() -> RoomType {
|
||||
RoomType::SubRoom
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, PartialOrd, Ord, Eq)]
|
||||
pub struct Room {
|
||||
pub room_id: OwnedRoomId,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
@@ -49,7 +49,7 @@ use thiserror::Error;
|
||||
#[derive(Debug, Error)]
|
||||
enum ConfigError {
|
||||
#[error("{0} is not exist")]
|
||||
NonExixtent(String),
|
||||
NonExistent(String),
|
||||
}
|
||||
|
||||
impl Config {
|
||||
|
||||
@@ -44,5 +44,15 @@ impl<T: StorageEngine> CrudHandler<T> {
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
pub async fn get_last_checkin_time(&self, user_id: &str) -> Result<Option<u64>> {
|
||||
let key = user_id.as_bytes();
|
||||
if let Some(value_bytes) = self.engine.get_raw(key).await? {
|
||||
let value: db::user_state::UserState = serde_json::from_slice(&value_bytes)?;
|
||||
Ok(Some(value.checkin_unix_mills))
|
||||
} else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
//TODO:补全其他方法,比如统计……
|
||||
}
|
||||
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
|
||||
pub struct UserState {
|
||||
pub is_checkin_today: bool,
|
||||
pub level: UserLevel,
|
||||
pub checkin_unix_second: u64,
|
||||
pub checkin_unix_mills: u64,
|
||||
pub checkin_times_in_month: usize,
|
||||
pub checkin_days: Vec<u32>, //每月在哪天签到了
|
||||
}
|
||||
@@ -36,7 +36,7 @@ impl UserState {
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
is_checkin_today: false,
|
||||
checkin_unix_second: 0,
|
||||
checkin_unix_mills: 0 as u64,
|
||||
checkin_times_in_month: 0,
|
||||
checkin_days: Vec::new(),
|
||||
level: UserLevel::Bronze,
|
||||
@@ -45,9 +45,9 @@ impl UserState {
|
||||
|
||||
pub fn checkin(&mut self) {
|
||||
self.is_checkin_today = true;
|
||||
let unix_time = tokio::time::Instant::now().elapsed().as_secs();
|
||||
let unix_time = tokio::time::Instant::now().elapsed().as_millis() as u64;
|
||||
|
||||
self.checkin_unix_second = unix_time;
|
||||
self.checkin_unix_mills = unix_time;
|
||||
self.checkin_times_in_month += 1;
|
||||
let day = chrono::Utc::now().day();
|
||||
if !self.checkin_days.contains(&day) {
|
||||
|
||||
+8
-4
@@ -21,12 +21,16 @@ async fn main() -> anyhow::Result<()> {
|
||||
bot.start().await?;
|
||||
bot.join_rooms().await?;
|
||||
|
||||
let bot = Arc::new(bot);
|
||||
let command_handler = CommandHandler::new(bot);
|
||||
let bot: Arc<dyn Bot + Send + Sync> = Arc::new(bot);
|
||||
let command_handler = CommandHandler::new(Arc::clone(&bot));
|
||||
let command_handle = command_handler.handle_commands().await?;
|
||||
|
||||
let bot_clone = Arc::clone(&bot);
|
||||
let schedule_handler = daily_bot::bot::schedule::ScheduleHandler::new().await;
|
||||
schedule_handler
|
||||
.add_daily_statistics_and_report_schedule(bot_clone, "* * 3 * * *")
|
||||
.await?;
|
||||
tokio::signal::ctrl_c().await?; // 等待 Ctrl+C 信号以优雅地关闭应用程序。
|
||||
|
||||
|
||||
let stop_tx = CommandHandler::global_sender();
|
||||
let _ = stop_tx.send(MessageEnum::StopMessage).await;
|
||||
let _ = tokio::time::timeout(Duration::from_secs(5), command_handle).await;
|
||||
|
||||
Reference in new issue
Block a user