修改了部分代码
This commit is contained in:
1 parent
d358ed3ddc
commit
47c3e908ec
6 files changed
+46
-16
No files matched your search
+20
-10
@@ -1,5 +1,6 @@
|
||||
use crate::bot::command_parser::parse_command;
|
||||
use crate::bot::define::{AttendanceHandler, Bot, InboundMessage, MessageEnum, OutboundMessage};
|
||||
use crate::bot::filters::support_chinese_command;
|
||||
use crate::db::crud_handler;
|
||||
use anyhow::{Result, anyhow};
|
||||
use async_trait::async_trait;
|
||||
@@ -23,7 +24,7 @@ fn global_channel() -> &'static (MessageTx, Mutex<Option<MessageRx>>) {
|
||||
pub struct ChannelManager {
|
||||
tx: MessageTx,
|
||||
rx: &'static Mutex<Option<MessageRx>>,
|
||||
filters: Option<Vec<Box<dyn Fn(&MessageEnum) -> MessageEnum + Send + Sync>>>,
|
||||
filters: Option<Vec<Box<dyn Fn(&InboundMessage) -> InboundMessage + Send + Sync>>>,
|
||||
}
|
||||
|
||||
//channel的包装,提供过滤功能,后续可以考虑增加更多功能,比如广播等
|
||||
@@ -31,14 +32,16 @@ impl ChannelManager {
|
||||
pub fn new() -> Self {
|
||||
let (tx, rx) = global_channel();
|
||||
|
||||
Self {
|
||||
let mut _self = Self {
|
||||
tx: tx.clone(),
|
||||
rx,
|
||||
filters: None,
|
||||
}
|
||||
};
|
||||
_self.reg_filters();
|
||||
_self
|
||||
}
|
||||
|
||||
fn filter_message(&self, msg: &MessageEnum) -> MessageEnum {
|
||||
fn filter_message(&self, msg: &InboundMessage) -> InboundMessage {
|
||||
let mut result_msg = msg.clone();
|
||||
if let Some(filters) = &self.filters {
|
||||
for filter in filters {
|
||||
@@ -47,15 +50,22 @@ impl ChannelManager {
|
||||
}
|
||||
result_msg
|
||||
}
|
||||
|
||||
fn reg_filters(&mut self) {
|
||||
let cn_filter = Box::new(support_chinese_command)
|
||||
as Box<dyn Fn(&InboundMessage) -> InboundMessage + Send + Sync>;
|
||||
self.filters.get_or_insert_with(Vec::new).push(cn_filter);
|
||||
//后续可以考虑增加更多过滤器
|
||||
}
|
||||
//这里先过滤,在发送,后续可以考虑在接收时过滤
|
||||
pub async fn send(&self, value: MessageEnum) -> Result<()> {
|
||||
let tx = self.tx.clone();
|
||||
let msg = self.filter_message(&value);
|
||||
|
||||
tx.send(msg)
|
||||
.await
|
||||
.map_err(|e| anyhow!("Failed to send message: {}", e))?;
|
||||
|
||||
if let MessageEnum::MatrixMessage(inbound_msg) = value {
|
||||
let filtered_msg = self.filter_message(&inbound_msg);
|
||||
tx.send(MessageEnum::MatrixMessage(filtered_msg)).await?;
|
||||
} else {
|
||||
tx.send(value).await?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user