fix the chatspam problem again again

This commit is contained in:
core 2023-07-22 00:07:36 -04:00
parent 3e6285c076
commit 8d73f281d2
Signed by: core
GPG Key ID: FDBF740DADDCEECF
1 changed files with 12 additions and 10 deletions

View File

@ -281,18 +281,20 @@ async fn handle_packet(e: Event, config: &Config, client: &mut Client, ws_stream
if !pkt.content().starts_with("/skill") {
info!("<{} ({})> {}", pkt.username().unwrap_or("SYSTEM".to_string()), pkt.uuid().map(|u| u.to_string()).unwrap_or("SYSTEM".to_string()), pkt.message());
handle_message(pkt.clone(), client, config).await;
let re = Regex::new(r"@[a-z0-9_-]+:").unwrap();
if !(re.is_match(&pkt.content()) && pkt.uuid() == Some(config.server.uuid)) {
info!("sending message");
ws_stream.send(Message::Text(serde_json::to_string(&GatewayPacketC2S::Relay { msg: GatewayChatMessage {
source: GatewayChatSource::Minecraft,
username: pkt.username().unwrap_or("SYSTEM".to_string()),
message: pkt.content(),
timestamp: DateTime::from(SystemTime::now()),
}})?)).await?;
}
}
let re = Regex::new(r"@[a-z0-9_-]+:").unwrap();
if !(re.is_match(&pkt.content()) && pkt.uuid() == Some(config.server.uuid)) {
info!("sending message");
ws_stream.send(Message::Text(serde_json::to_string(&GatewayPacketC2S::Relay { msg: GatewayChatMessage {
source: GatewayChatSource::Minecraft,
username: pkt.username().unwrap_or("SYSTEM".to_string()),
message: pkt.content(),
timestamp: DateTime::from(SystemTime::now()),
}})?)).await?;
}