From 7e1abab66d6fd6d723e2429f01d104dc1a06ec36 Mon Sep 17 00:00:00 2001 From: projectmoon Date: Sun, 29 Nov 2020 21:18:41 +0000 Subject: [PATCH] Resync command now uses record_room_information. --- src/bot/event_handlers.rs | 4 +++- src/commands/management.rs | 16 +++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/bot/event_handlers.rs b/src/bot/event_handlers.rs index 1b71cd6..7d735cd 100644 --- a/src/bot/event_handlers.rs +++ b/src/bot/event_handlers.rs @@ -92,7 +92,9 @@ fn should_process_event(db: &Database, room_id: &str, event_id: &str) -> bool { }) } -async fn record_room_information( +//TODO this needs to be moved to a common API layer. +/// Record the information about a room, including users in it. +pub async fn record_room_information( client: &matrix_sdk::Client, db: &crate::db::Database, room: &matrix_sdk::Room, diff --git a/src/commands/management.rs b/src/commands/management.rs index ac150cf..2243936 100644 --- a/src/commands/management.rs +++ b/src/commands/management.rs @@ -1,7 +1,6 @@ use super::{Command, Execution}; use crate::context::Context; use crate::db::errors::DataError; -use crate::matrix; use async_trait::async_trait; use matrix_sdk::identifiers::UserId; @@ -16,17 +15,16 @@ impl Command for ResyncCommand { } async fn execute(&self, ctx: &Context<'_>) -> Execution { - let room_id = &ctx.room.room_id; let our_username: Option = ctx.matrix_client.user_id().await; let our_username: &str = our_username.as_ref().map_or("", UserId::as_str); - let usernames = matrix::get_users_in_room(&ctx.matrix_client, &room_id).await; - - let result: ResyncResult = usernames - .into_iter() - .filter(|username| username != our_username) - .map(|username| ctx.db.rooms.add_user_to_room(&username, room_id.as_str())) - .collect(); //Make use of collect impl on Result. + let result: ResyncResult = crate::bot::event_handlers::record_room_information( + ctx.matrix_client, + &ctx.db, + &ctx.room, + our_username, + ) + .await; let (plain, html) = match result { Ok(()) => {