char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

matrix-sdk: add event visibility check to ensure_members

master
SaurusXI 2021-06-20 12:30:12 +05:30
parent 092ca90403
commit 0e84349d05
No known key found for this signature in database
GPG Key ID: 443CCBEAA2C0E87E
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
matrix_sdk/src/room/common.rs
View File

@ -13,7 +13,7 @@ use ruma::{
use crate::{ use crate::{
media::{MediaFormat, MediaRequest, MediaType}, media::{MediaFormat, MediaRequest, MediaType},
BaseRoom, Client, Result, RoomMember, BaseRoom, Client, Result, RoomMember, room::RoomType, error::{self, HttpError}
}; };
/// A struct containing methods that are common for Joined, Invited and Left /// A struct containing methods that are common for Joined, Invited and Left
@ -170,6 +170,12 @@ impl Common {
} }
async fn ensure_members(&self) -> Result<()> { async fn ensure_members(&self) -> Result<()> {
if !self.are_events_visible() {
return Err(
error::Error::Http(HttpError::NotClientRequest)
)
}
if !self.are_members_synced() { if !self.are_members_synced() {
self.request_members().await?; self.request_members().await?;
} }
@ -179,7 +185,7 @@ impl Common {
fn are_events_visible(&self) -> bool { fn are_events_visible(&self) -> bool {
if let RoomType::Invited = self.inner.room_type() { if let RoomType::Invited = self.inner.room_type() {
match self.inner.history_visibility() { return match self.inner.history_visibility() {
HistoryVisibility::WorldReadable | HistoryVisibility::Shared => true, HistoryVisibility::WorldReadable | HistoryVisibility::Shared => true,
_ => false, _ => false,
} }