🗑️ WorkerTask::GetRoomMembers isn't used, remove it

This commit is contained in:
2024-05-22 16:06:44 +02:00
parent 8c244ce4a7
commit 35e191eb62
5 changed files with 4 additions and 48 deletions

View File

@@ -44,7 +44,6 @@ pub trait RoomMessagingConsumerInterface {
#[async_trait(?Send)] #[async_trait(?Send)]
pub trait RoomMessagingProviderInterface { pub trait RoomMessagingProviderInterface {
async fn get_avatar(&self, id: &RoomId) -> anyhow::Result<Option<Avatar>>; async fn get_avatar(&self, id: &RoomId) -> anyhow::Result<Option<Avatar>>;
async fn get_members(&self, id: &RoomId) -> anyhow::Result<Vec<RoomMember>>;
} }
#[async_trait(?Send)] #[async_trait(?Send)]

View File

@@ -7,8 +7,7 @@ use std::{
use async_trait::async_trait; use async_trait::async_trait;
use futures::future::{join, join_all}; use futures::future::{join, join_all};
use matrix_sdk::ruma::OwnedRoomId; use matrix_sdk::{ruma::OwnedRoomId, RoomState as MatrixRoomState};
use matrix_sdk::RoomState as MatrixRoomState;
use tracing::{debug, debug_span, error, instrument, trace}; use tracing::{debug, debug_span, error, instrument, trace};
use super::{ use super::{

View File

@@ -10,7 +10,7 @@ use matrix_sdk::{
config::SyncSettings, config::SyncSettings,
event_handler::Ctx, event_handler::Ctx,
media::{MediaFormat, MediaRequest, MediaThumbnailSize}, media::{MediaFormat, MediaRequest, MediaThumbnailSize},
room::{ParentSpace, Room, RoomMember}, room::{ParentSpace, Room},
ruma::{ ruma::{
api::client::media::get_content_thumbnail::v3::Method, api::client::media::get_content_thumbnail::v3::Method,
events::{ events::{
@@ -26,7 +26,7 @@ use matrix_sdk::{
}, },
uint, OwnedMxcUri, OwnedRoomId, OwnedUserId, RoomId, UserId, uint, OwnedMxcUri, OwnedRoomId, OwnedUserId, RoomId, UserId,
}, },
Client as MatrixClient, RoomMemberships, RoomState, Client as MatrixClient, RoomState,
}; };
use tokio::sync::{ use tokio::sync::{
broadcast, broadcast,
@@ -702,21 +702,6 @@ impl Client {
} }
} }
async fn get_room_members(&mut self, room_id: &OwnedRoomId) -> anyhow::Result<Vec<RoomMember>> {
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 // TODO: Share MediaRequest with other media requests
async fn get_thumbnail(&self, media_url: OwnedMxcUri) -> anyhow::Result<Vec<u8>> { async fn get_thumbnail(&self, media_url: OwnedMxcUri) -> anyhow::Result<Vec<u8>> {
let client = self.client.as_ref().unwrap(); let client = self.client.as_ref().unwrap();
@@ -814,10 +799,6 @@ impl Client {
WorkerTask::GetRoomAvatar(id, reply) => { WorkerTask::GetRoomAvatar(id, reply) => {
reply.send(self.get_room_avatar(&id).await).await; 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) => { WorkerTask::GetRoomMemberAvatar(room_id, user_id, avatar_url, reply) => {
reply reply
.send( .send(

View File

@@ -362,19 +362,6 @@ impl RoomMessagingProviderInterface for Requester {
async fn get_avatar(&self, room_id: &RoomId) -> anyhow::Result<Option<Avatar>> { async fn get_avatar(&self, room_id: &RoomId) -> anyhow::Result<Option<Avatar>> {
request_to_worker!(self, WorkerTask::GetRoomAvatar, room_id.clone()) request_to_worker!(self, WorkerTask::GetRoomAvatar, room_id.clone())
} }
// TODO: Fix return code
async fn get_members(&self, room_id: &RoomId) -> anyhow::Result<Vec<RoomMember>> {
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)] #[async_trait(?Send)]

View File

@@ -1,9 +1,6 @@
use std::fmt::{Debug, Formatter}; use std::fmt::{Debug, Formatter};
use matrix_sdk::{ use matrix_sdk::ruma::{OwnedMxcUri, OwnedRoomId, OwnedUserId};
room::RoomMember,
ruma::{OwnedMxcUri, OwnedRoomId, OwnedUserId},
};
use crate::utils::Sender; use crate::utils::Sender;
@@ -20,8 +17,6 @@ pub enum WorkerTask {
GetAvatar(Sender<anyhow::Result<Option<Vec<u8>>>>), GetAvatar(Sender<anyhow::Result<Option<Vec<u8>>>>),
GetRoomAvatar(OwnedRoomId, Sender<anyhow::Result<Option<Vec<u8>>>>), GetRoomAvatar(OwnedRoomId, Sender<anyhow::Result<Option<Vec<u8>>>>),
GetRoomMembers(OwnedRoomId, Sender<anyhow::Result<Vec<RoomMember>>>),
GetRoomMemberAvatar( GetRoomMemberAvatar(
OwnedRoomId, OwnedRoomId,
OwnedUserId, OwnedUserId,
@@ -60,11 +55,6 @@ impl Debug for WorkerTask {
.debug_tuple("WorkerTask::GetRoomAvatar") .debug_tuple("WorkerTask::GetRoomAvatar")
.field(id) .field(id)
.finish(), .finish(),
WorkerTask::GetRoomMembers(id, _) => f
.debug_tuple("WorkerTask::GetRoomMembers")
.field(id)
.finish(),
WorkerTask::GetRoomMemberAvatar(room_id, user_id, avatar_url, _) => f WorkerTask::GetRoomMemberAvatar(room_id, user_id, avatar_url, _) => f
.debug_tuple("WorkerTask::GetRoomMemberAvatar") .debug_tuple("WorkerTask::GetRoomMemberAvatar")
.field(room_id) .field(room_id)