From 35e191eb6273b2e3fb7d87fa07913fcb22dff973 Mon Sep 17 00:00:00 2001 From: Adrien Date: Wed, 22 May 2024 16:06:44 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20=20WorkerTask::GetRoomM?= =?UTF-8?q?embers=20isn't=20used,=20remove=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/domain/model/messaging_interface.rs | 1 - src/domain/model/room.rs | 3 +-- src/infrastructure/messaging/matrix/client.rs | 23 ++----------------- .../messaging/matrix/requester.rs | 13 ----------- .../messaging/matrix/worker_tasks.rs | 12 +--------- 5 files changed, 4 insertions(+), 48 deletions(-) diff --git a/src/domain/model/messaging_interface.rs b/src/domain/model/messaging_interface.rs index 7f3ce4e..0ef1ace 100644 --- a/src/domain/model/messaging_interface.rs +++ b/src/domain/model/messaging_interface.rs @@ -44,7 +44,6 @@ pub trait RoomMessagingConsumerInterface { #[async_trait(?Send)] pub trait RoomMessagingProviderInterface { async fn get_avatar(&self, id: &RoomId) -> anyhow::Result>; - async fn get_members(&self, id: &RoomId) -> anyhow::Result>; } #[async_trait(?Send)] diff --git a/src/domain/model/room.rs b/src/domain/model/room.rs index eb98e4c..b0e1df0 100644 --- a/src/domain/model/room.rs +++ b/src/domain/model/room.rs @@ -7,8 +7,7 @@ use std::{ use async_trait::async_trait; use futures::future::{join, join_all}; -use matrix_sdk::ruma::OwnedRoomId; -use matrix_sdk::RoomState as MatrixRoomState; +use matrix_sdk::{ruma::OwnedRoomId, RoomState as MatrixRoomState}; use tracing::{debug, debug_span, error, instrument, trace}; use super::{ diff --git a/src/infrastructure/messaging/matrix/client.rs b/src/infrastructure/messaging/matrix/client.rs index 7209745..33f9eee 100644 --- a/src/infrastructure/messaging/matrix/client.rs +++ b/src/infrastructure/messaging/matrix/client.rs @@ -10,7 +10,7 @@ use matrix_sdk::{ config::SyncSettings, event_handler::Ctx, media::{MediaFormat, MediaRequest, MediaThumbnailSize}, - room::{ParentSpace, Room, RoomMember}, + room::{ParentSpace, Room}, ruma::{ api::client::media::get_content_thumbnail::v3::Method, events::{ @@ -26,7 +26,7 @@ use matrix_sdk::{ }, uint, OwnedMxcUri, OwnedRoomId, OwnedUserId, RoomId, UserId, }, - Client as MatrixClient, RoomMemberships, RoomState, + Client as MatrixClient, RoomState, }; use tokio::sync::{ broadcast, @@ -702,21 +702,6 @@ impl Client { } } - async fn get_room_members(&mut self, room_id: &OwnedRoomId) -> anyhow::Result> { - let client = self.client.as_ref().unwrap(); - - if let Some(room) = client.get_room(room_id) { - match room.members(RoomMemberships::ACTIVE).await { - Ok(room_members) => Ok(room_members), - Err(err) => Err(err.into()), - } - } else { - warn!("No room found with the \"{}\" id", room_id.as_str()); - // TODO: Return an error if the room has not been found - Ok(vec![]) - } - } - // TODO: Share MediaRequest with other media requests async fn get_thumbnail(&self, media_url: OwnedMxcUri) -> anyhow::Result> { let client = self.client.as_ref().unwrap(); @@ -814,10 +799,6 @@ impl Client { WorkerTask::GetRoomAvatar(id, reply) => { reply.send(self.get_room_avatar(&id).await).await; } - WorkerTask::GetRoomMembers(id, reply) => { - reply.send(self.get_room_members(&id).await).await; - } - WorkerTask::GetRoomMemberAvatar(room_id, user_id, avatar_url, reply) => { reply .send( diff --git a/src/infrastructure/messaging/matrix/requester.rs b/src/infrastructure/messaging/matrix/requester.rs index 20e80c5..63bc10a 100644 --- a/src/infrastructure/messaging/matrix/requester.rs +++ b/src/infrastructure/messaging/matrix/requester.rs @@ -362,19 +362,6 @@ impl RoomMessagingProviderInterface for Requester { async fn get_avatar(&self, room_id: &RoomId) -> anyhow::Result> { request_to_worker!(self, WorkerTask::GetRoomAvatar, room_id.clone()) } - - // TODO: Fix return code - async fn get_members(&self, room_id: &RoomId) -> anyhow::Result> { - match request_to_worker!(self, WorkerTask::GetRoomMembers, room_id.clone()) { - Ok(matrix_room_members) => { - Ok(join_all(matrix_room_members.iter().map(|member| async { - RoomMember::from_matrix(member, room_id, Rc::new(self.clone())).await - })) - .await) - } - Err(err) => Err(err), - } - } } #[async_trait(?Send)] diff --git a/src/infrastructure/messaging/matrix/worker_tasks.rs b/src/infrastructure/messaging/matrix/worker_tasks.rs index 380d15a..74fdb0f 100644 --- a/src/infrastructure/messaging/matrix/worker_tasks.rs +++ b/src/infrastructure/messaging/matrix/worker_tasks.rs @@ -1,9 +1,6 @@ use std::fmt::{Debug, Formatter}; -use matrix_sdk::{ - room::RoomMember, - ruma::{OwnedMxcUri, OwnedRoomId, OwnedUserId}, -}; +use matrix_sdk::ruma::{OwnedMxcUri, OwnedRoomId, OwnedUserId}; use crate::utils::Sender; @@ -20,8 +17,6 @@ pub enum WorkerTask { GetAvatar(Sender>>>), GetRoomAvatar(OwnedRoomId, Sender>>>), - GetRoomMembers(OwnedRoomId, Sender>>), - GetRoomMemberAvatar( OwnedRoomId, OwnedUserId, @@ -60,11 +55,6 @@ impl Debug for WorkerTask { .debug_tuple("WorkerTask::GetRoomAvatar") .field(id) .finish(), - WorkerTask::GetRoomMembers(id, _) => f - .debug_tuple("WorkerTask::GetRoomMembers") - .field(id) - .finish(), - WorkerTask::GetRoomMemberAvatar(room_id, user_id, avatar_url, _) => f .debug_tuple("WorkerTask::GetRoomMemberAvatar") .field(room_id)