projectmoon
/
tenebrous-dicebot
1
0
Fork 1
Code Issues 12 Pull Requests 1 Projects Releases 10 Wiki Activity

Add should process check to room member event

This commit is contained in:
projectmoon 2020-11-09 21:13:47 +00:00
parent fb24090952
commit 74d0b88e80
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/bot/event_handlers.rs
View File

@ -1,10 +1,11 @@
use crate::db::Database;
use crate::error::BotError; use crate::error::BotError;
use async_trait::async_trait; use async_trait::async_trait;
use log::{debug, error, info, warn}; use log::{debug, error, info, warn};
use matrix_sdk::{ use matrix_sdk::{
self, self,
events::{ events::{
room::member::{MemberEventContent, MembershipState}, room::member::{MemberEventContent, MembershipChange},
room::message::{MessageEventContent, TextMessageEventContent}, room::message::{MessageEventContent, TextMessageEventContent},
StrippedStateEvent, SyncMessageEvent, SyncStateEvent, StrippedStateEvent, SyncMessageEvent, SyncStateEvent,
}, },
@ -73,32 +74,45 @@ async fn should_process<'a>(
Ok((msg_body, sender_username)) Ok((msg_body, sender_username))
} }
fn should_process_event(db: &Database, room_id: &str, event_id: &str) -> bool {
db.rooms
.should_process(room_id, event_id)
.unwrap_or_else(|e| {
error!(
"Database error when checking if we should process an event: {}",
e.to_string()
);
false
})
}
/// This event emitter listens for messages with dice rolling commands. /// This event emitter listens for messages with dice rolling commands.
/// Originally adapted from the matrix-rust-sdk examples. /// Originally adapted from the matrix-rust-sdk examples.
#[async_trait] #[async_trait]
impl EventEmitter for DiceBot { impl EventEmitter for DiceBot {
async fn on_room_member( async fn on_room_member(&self, room: SyncRoom, event: &SyncStateEvent<MemberEventContent>) {
&self, if let SyncRoom::Joined(room) | SyncRoom::Left(room) = room {
room: SyncRoom, //Clone to avoid holding lock.
room_member: &SyncStateEvent<MemberEventContent>, let room = room.read().await.clone();
) { let (room_id, username) = (room.room_id.as_str(), &event.state_key);
if let SyncRoom::Joined(room) = room {
if !should_process_event(&self.db, room_id, event.event_id.as_str()) {
return;
}
let event_affects_us = if let Some(our_user_id) = self.client.user_id().await { let event_affects_us = if let Some(our_user_id) = self.client.user_id().await {
room_member.state_key == our_user_id event.state_key == our_user_id
} else { } else {
false false
}; };
let adding_user = match room_member.content.membership { use MembershipChange::*;
MembershipState::Join => true, let adding_user = match event.membership_change() {
MembershipState::Leave | MembershipState::Ban => false, Joined => true,
Banned | Left | Kicked | KickedAndBanned => false,
_ => return, _ => return,
}; };
//Clone to avoid holding lock.
let room = room.read().await.clone();
let (room_id, username) = (room.room_id.as_str(), &room_member.state_key);
let result = if event_affects_us && !adding_user { let result = if event_affects_us && !adding_user {
info!("Clearing all information for room ID {}", room_id); info!("Clearing all information for room ID {}", room_id);
self.db.rooms.clear_info(room_id) self.db.rooms.clear_info(room_id)
@ -109,7 +123,7 @@ impl EventEmitter for DiceBot {
info!("Removing user {} from room ID {}", username, room_id); info!("Removing user {} from room ID {}", username, room_id);
self.db.rooms.remove_user_from_room(username, room_id) self.db.rooms.remove_user_from_room(username, room_id)
} else { } else {
debug!("Ignoring a room member event: {:#?}", room_member); debug!("Ignoring a room member event: {:#?}", event);
Ok(()) Ok(())
}; };