🗑️ WorkerTask::GetRoomMembers isn't used, remove it
This commit is contained in:
@@ -44,7 +44,6 @@ pub trait RoomMessagingConsumerInterface {
|
||||
#[async_trait(?Send)]
|
||||
pub trait RoomMessagingProviderInterface {
|
||||
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)]
|
||||
|
@@ -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::{
|
||||
|
@@ -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<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
|
||||
async fn get_thumbnail(&self, media_url: OwnedMxcUri) -> anyhow::Result<Vec<u8>> {
|
||||
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(
|
||||
|
@@ -362,19 +362,6 @@ impl RoomMessagingProviderInterface for Requester {
|
||||
async fn get_avatar(&self, room_id: &RoomId) -> anyhow::Result<Option<Avatar>> {
|
||||
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)]
|
||||
|
@@ -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<anyhow::Result<Option<Vec<u8>>>>),
|
||||
|
||||
GetRoomAvatar(OwnedRoomId, Sender<anyhow::Result<Option<Vec<u8>>>>),
|
||||
GetRoomMembers(OwnedRoomId, Sender<anyhow::Result<Vec<RoomMember>>>),
|
||||
|
||||
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)
|
||||
|
Reference in New Issue
Block a user