Fix typo: visiblity -> visibility

master
Denis Kasak 2021-03-02 09:40:55 +01:00
parent aa16a7e291
commit df8c489304
8 changed files with 16 additions and 16 deletions

View File

@ -1159,24 +1159,24 @@ impl BaseClient {
match &*olm { match &*olm {
Some(o) => { Some(o) => {
let (history_visiblity, settings) = self let (history_visibility, settings) = self
.get_room(room_id) .get_room(room_id)
.map(|r| (r.history_visiblity(), r.encryption_settings())) .map(|r| (r.history_visibility(), r.encryption_settings()))
.unwrap_or((HistoryVisibility::Joined, None)); .unwrap_or((HistoryVisibility::Joined, None));
let joined = self.store.get_joined_user_ids(room_id).await?; let joined = self.store.get_joined_user_ids(room_id).await?;
let invited = self.store.get_invited_user_ids(room_id).await?; let invited = self.store.get_invited_user_ids(room_id).await?;
// Don't share the group session with members that are invited // Don't share the group session with members that are invited
// if the history visiblity is set to `Joined` // if the history visibility is set to `Joined`
let members = if history_visiblity == HistoryVisibility::Joined { let members = if history_visibility == HistoryVisibility::Joined {
joined.iter().chain(&[]) joined.iter().chain(&[])
} else { } else {
joined.iter().chain(&invited) joined.iter().chain(&invited)
}; };
let settings = settings.ok_or(MegolmError::EncryptionNotEnabled)?; let settings = settings.ok_or(MegolmError::EncryptionNotEnabled)?;
let settings = EncryptionSettings::new(settings, history_visiblity); let settings = EncryptionSettings::new(settings, history_visibility);
Ok(o.share_group_session(room_id, members, settings).await?) Ok(o.share_group_session(room_id, members, settings).await?)
} }

View File

@ -80,8 +80,8 @@ impl RoomState {
} }
} }
/// Get the history visiblity policy of this room. /// Get the history visibility policy of this room.
pub fn history_visiblity(&self) -> HistoryVisibility { pub fn history_visibility(&self) -> HistoryVisibility {
match self { match self {
RoomState::Joined(r) => r.inner.history_visibility(), RoomState::Joined(r) => r.inner.history_visibility(),
RoomState::Left(r) => r.inner.history_visibility(), RoomState::Left(r) => r.inner.history_visibility(),
@ -169,7 +169,7 @@ pub struct BaseRoomInfo {
pub encryption: Option<EncryptionEventContent>, pub encryption: Option<EncryptionEventContent>,
/// The guest access policy of this room. /// The guest access policy of this room.
pub guest_access: GuestAccess, pub guest_access: GuestAccess,
/// The history visiblity policy of this room. /// The history visibility policy of this room.
pub history_visibility: HistoryVisibility, pub history_visibility: HistoryVisibility,
/// The join rule policy of this room. /// The join rule policy of this room.
pub join_rule: JoinRule, pub join_rule: JoinRule,

View File

@ -197,7 +197,7 @@ impl Room {
self.inner.read().unwrap().base_info.guest_access.clone() self.inner.read().unwrap().base_info.guest_access.clone()
} }
/// Get the history visiblity policy of this room. /// Get the history visibility policy of this room.
pub fn history_visibility(&self) -> HistoryVisibility { pub fn history_visibility(&self) -> HistoryVisibility {
self.inner self.inner
.read() .read()

View File

@ -105,7 +105,7 @@ impl StrippedRoom {
self.inner.lock().unwrap().base_info.encryption.clone() self.inner.lock().unwrap().base_info.encryption.clone()
} }
/// Get the history visiblity policy of this room. /// Get the history visibility policy of this room.
pub fn history_visibility(&self) -> HistoryVisibility { pub fn history_visibility(&self) -> HistoryVisibility {
self.inner self.inner
.lock() .lock()

View File

@ -991,7 +991,7 @@ impl ReadOnlyAccount {
return Err(()); return Err(());
} }
let visiblity = settings.history_visibility.clone(); let visibility = settings.history_visibility.clone();
let outbound = OutboundGroupSession::new( let outbound = OutboundGroupSession::new(
self.device_id.clone(), self.device_id.clone(),
@ -1009,7 +1009,7 @@ impl ReadOnlyAccount {
signing_key, signing_key,
&room_id, &room_id,
outbound.session_key().await, outbound.session_key().await,
Some(visiblity), Some(visibility),
) )
.expect("Can't create inbound group session from a newly created outbound group session"); .expect("Can't create inbound group session from a newly created outbound group session");

View File

@ -383,7 +383,7 @@ pub struct PickledInboundGroupSession {
/// Flag remembering if the session was dirrectly sent to us by the sender /// Flag remembering if the session was dirrectly sent to us by the sender
/// or if it was imported. /// or if it was imported.
pub imported: bool, pub imported: bool,
/// History visiblity of the room when the session was created. /// History visibility of the room when the session was created.
pub history_visibility: Option<HistoryVisibility>, pub history_visibility: Option<HistoryVisibility>,
} }

View File

@ -98,7 +98,7 @@ impl Default for EncryptionSettings {
impl EncryptionSettings { impl EncryptionSettings {
/// Create new encryption settings using an `EncryptionEventContent` and a /// Create new encryption settings using an `EncryptionEventContent` and a
/// history visiblity. /// history visibility.
pub fn new(content: EncryptionEventContent, history_visibility: HistoryVisibility) -> Self { pub fn new(content: EncryptionEventContent, history_visibility: HistoryVisibility) -> Self {
let rotation_period: Duration = content let rotation_period: Duration = content
.rotation_period_ms .rotation_period_ms

View File

@ -242,7 +242,7 @@ impl GroupSessionManager {
.collect::<HashSet<_>>() .collect::<HashSet<_>>()
.is_empty(); .is_empty();
let visiblity_changed = outbound.settings().history_visibility != history_visibility; let visibility_changed = outbound.settings().history_visibility != history_visibility;
// To protect the room history we need to rotate the session if either: // To protect the room history we need to rotate the session if either:
// //
@ -251,7 +251,7 @@ impl GroupSessionManager {
// 3. The history visibility changed. // 3. The history visibility changed.
// //
// This is calculated in the following code and stored in this variable. // This is calculated in the following code and stored in this variable.
let mut should_rotate = user_left || visiblity_changed; let mut should_rotate = user_left || visibility_changed;
for user_id in users { for user_id in users {
let user_devices = self.store.get_user_devices(&user_id).await?; let user_devices = self.store.get_user_devices(&user_id).await?;