From 15f279e6bc156ca30a1bc03682d7b4cc45141da1 Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Wed, 30 Nov 2022 20:18:35 +0000 Subject: [PATCH] Rename Visibility to RoomVisibility. --- client/src/control/response.rs | 6 ++-- .../src/handlers/room_join_request_handler.rs | 12 +++---- .../handlers/room_join_response_handler.rs | 4 +-- .../src/handlers/room_list_request_handler.rs | 9 ++++-- .../handlers/room_list_response_handler.rs | 9 ++++-- .../handlers/room_message_response_handler.rs | 12 +++---- client/src/room/map.rs | 32 ++++++++++++------- client/src/room/state.rs | 6 ++-- 8 files changed, 53 insertions(+), 37 deletions(-) diff --git a/client/src/control/response.rs b/client/src/control/response.rs index ed5df85..a5aac16 100644 --- a/client/src/control/response.rs +++ b/client/src/control/response.rs @@ -110,7 +110,7 @@ mod tests { use solstice_proto::{User, UserStatus}; use crate::room::{ - Message, MessageHistory, RoomMembership, RoomState, Visibility, + Message, MessageHistory, RoomMembership, RoomState, RoomVisibility, }; use super::{ @@ -196,7 +196,7 @@ mod tests { room_name: "bleep".to_string(), room: RoomState { membership: RoomMembership::Joining, - visibility: Visibility::PrivateOwned, + visibility: RoomVisibility::PrivateOwned, operated: false, user_count: 3, owner: None, @@ -271,7 +271,7 @@ mod tests { "bleep".to_string(), RoomState { membership: RoomMembership::Joining, - visibility: Visibility::PrivateOwned, + visibility: RoomVisibility::PrivateOwned, operated: false, user_count: 3, owner: None, diff --git a/client/src/handlers/room_join_request_handler.rs b/client/src/handlers/room_join_request_handler.rs index d577100..7e19cf9 100644 --- a/client/src/handlers/room_join_request_handler.rs +++ b/client/src/handlers/room_join_request_handler.rs @@ -75,7 +75,7 @@ mod tests { use crate::context::{ContextBundle, ContextOptions}; use crate::control; use crate::message_handler::MessageHandler; - use crate::room::{RoomMembership, RoomState, Visibility}; + use crate::room::{RoomMembership, RoomState, RoomVisibility}; use super::RoomJoinRequestHandler; @@ -99,7 +99,7 @@ mod tests { #[test] fn run_already_joined_responds_immediately() -> anyhow::Result<()> { - let mut room = RoomState::new(Visibility::Public, 3); + let mut room = RoomState::new(RoomVisibility::Public, 3); room.membership = RoomMembership::Member; let mut options = ContextOptions::default(); @@ -135,10 +135,10 @@ mod tests { #[test] fn run_success() -> anyhow::Result<()> { let mut options = ContextOptions::default(); - options - .initial_state - .rooms - .insert("bleep".to_string(), RoomState::new(Visibility::Public, 3)); + options.initial_state.rooms.insert( + "bleep".to_string(), + RoomState::new(RoomVisibility::Public, 3), + ); let mut bundle = ContextBundle::new(options); RoomJoinRequestHandler::default() diff --git a/client/src/handlers/room_join_response_handler.rs b/client/src/handlers/room_join_response_handler.rs index c8f9910..0c74331 100644 --- a/client/src/handlers/room_join_response_handler.rs +++ b/client/src/handlers/room_join_response_handler.rs @@ -55,13 +55,13 @@ mod tests { use crate::context::{ContextBundle, ContextOptions}; use crate::control; use crate::message_handler::MessageHandler; - use crate::room::{RoomMembership, RoomState, Visibility}; + use crate::room::{RoomMembership, RoomState, RoomVisibility}; use super::RoomJoinResponseHandler; #[test] fn run_updates_room_state_and_forwards_response() { - let mut room = RoomState::new(Visibility::Public, 42); + let mut room = RoomState::new(RoomVisibility::Public, 42); let mut options = ContextOptions::default(); options diff --git a/client/src/handlers/room_list_request_handler.rs b/client/src/handlers/room_list_request_handler.rs index e6ad47c..c47986b 100644 --- a/client/src/handlers/room_list_request_handler.rs +++ b/client/src/handlers/room_list_request_handler.rs @@ -45,7 +45,7 @@ mod tests { use crate::context::{ContextBundle, ContextOptions}; use crate::control; use crate::message_handler::MessageHandler; - use crate::room::{RoomState, Visibility}; + use crate::room::{RoomState, RoomVisibility}; use super::RoomListRequestHandler; @@ -97,10 +97,13 @@ mod tests { assert_eq!( rooms, vec![ - ("apple".to_string(), RoomState::new(Visibility::Public, 42)), + ( + "apple".to_string(), + RoomState::new(RoomVisibility::Public, 42) + ), ( "potato".to_string(), - RoomState::new(Visibility::Public, 123) + RoomState::new(RoomVisibility::Public, 123) ), ] ); diff --git a/client/src/handlers/room_list_response_handler.rs b/client/src/handlers/room_list_response_handler.rs index 6beefe5..4db1f6b 100644 --- a/client/src/handlers/room_list_response_handler.rs +++ b/client/src/handlers/room_list_response_handler.rs @@ -41,7 +41,7 @@ mod tests { use crate::context::ContextBundle; use crate::message_handler::MessageHandler; - use crate::room::{RoomState, Visibility}; + use crate::room::{RoomState, RoomVisibility}; use super::RoomListResponseHandler; @@ -71,10 +71,13 @@ mod tests { assert_eq!( rooms, vec![ - ("apple".to_string(), RoomState::new(Visibility::Public, 42)), + ( + "apple".to_string(), + RoomState::new(RoomVisibility::Public, 42) + ), ( "potato".to_string(), - RoomState::new(Visibility::Public, 123) + RoomState::new(RoomVisibility::Public, 123) ), ] ); diff --git a/client/src/handlers/room_message_response_handler.rs b/client/src/handlers/room_message_response_handler.rs index f883567..13c362a 100644 --- a/client/src/handlers/room_message_response_handler.rs +++ b/client/src/handlers/room_message_response_handler.rs @@ -58,7 +58,7 @@ mod tests { use crate::context::{ContextBundle, ContextOptions}; use crate::control; use crate::message_handler::MessageHandler; - use crate::room::{Message, RoomState, Visibility}; + use crate::room::{Message, RoomState, RoomVisibility}; use super::RoomMessageResponseHandler; @@ -69,10 +69,10 @@ mod tests { #[test] fn run_forwards_response() { let mut options = ContextOptions::default(); - options - .initial_state - .rooms - .insert("apple".to_string(), RoomState::new(Visibility::Public, 1)); + options.initial_state.rooms.insert( + "apple".to_string(), + RoomState::new(RoomVisibility::Public, 1), + ); options.simulated_clock = Some(SimulatedSystemClock::new(system_time_from_secs(42))); @@ -109,7 +109,7 @@ mod tests { #[test] fn run_stores_message() { - let mut room = RoomState::new(Visibility::Public, 42); + let mut room = RoomState::new(RoomVisibility::Public, 42); room.messages.insert(Message { received_at: system_time_from_secs(42), user_name: "karandeep".to_string(), diff --git a/client/src/room/map.rs b/client/src/room/map.rs index 39d3e66..e99f96b 100644 --- a/client/src/room/map.rs +++ b/client/src/room/map.rs @@ -5,7 +5,7 @@ use log::{error, info, warn}; use solstice_proto::{server, User}; use thiserror::Error; -use crate::room::{RoomMembership, RoomState, Visibility}; +use crate::room::{RoomMembership, RoomState, RoomVisibility}; /// The error returned by RoomMap functions. #[derive(Debug, Error)] @@ -70,12 +70,12 @@ impl RoomMap { fn update_one( &mut self, name: String, - visibility: Visibility, + visibility: RoomVisibility, user_count: u32, old_map: &mut HashMap, ) { let room = match old_map.remove(&name) { - None => RoomState::new(Visibility::Public, user_count as usize), + None => RoomState::new(RoomVisibility::Public, user_count as usize), Some(mut room) => { room.visibility = visibility; room.user_count = user_count as usize; @@ -95,17 +95,27 @@ impl RoomMap { // Add all public rooms. for (name, user_count) in response.rooms.drain(..) { - self.update_one(name, Visibility::Public, user_count, &mut old_map); + self.update_one(name, RoomVisibility::Public, user_count, &mut old_map); } // Add all private, owned, rooms. for (name, user_count) in response.owned_private_rooms.drain(..) { - self.update_one(name, Visibility::PrivateOwned, user_count, &mut old_map); + self.update_one( + name, + RoomVisibility::PrivateOwned, + user_count, + &mut old_map, + ); } // Add all private, unowned, rooms. for (name, user_count) in response.other_private_rooms.drain(..) { - self.update_one(name, Visibility::PrivateOther, user_count, &mut old_map); + self.update_one( + name, + RoomVisibility::PrivateOther, + user_count, + &mut old_map, + ); } // Mark all operated rooms as necessary. @@ -268,7 +278,7 @@ mod tests { use solstice_proto::server::RoomListResponse; use crate::room::{ - Message, MessageHistory, RoomMembership, RoomState, Visibility, + Message, MessageHistory, RoomMembership, RoomState, RoomVisibility, }; use super::RoomMap; @@ -284,8 +294,8 @@ mod tests { #[test] fn deserialize_visibility() { assert_eq!( - serde_json::from_str::(r#""Public""#).unwrap(), - Visibility::Public + serde_json::from_str::(r#""Public""#).unwrap(), + RoomVisibility::Public ); } @@ -340,7 +350,7 @@ mod tests { .unwrap(), RoomState { membership: RoomMembership::Joining, - visibility: Visibility::PrivateOwned, + visibility: RoomVisibility::PrivateOwned, operated: false, user_count: 3, owner: None, @@ -389,7 +399,7 @@ mod tests { assert_eq!( rooms.get_strict("room a").unwrap(), - &RoomState::new(Visibility::Public, 42) + &RoomState::new(RoomVisibility::Public, 42) ); } } diff --git a/client/src/room/state.rs b/client/src/room/state.rs index d9f8f69..f4aa807 100644 --- a/client/src/room/state.rs +++ b/client/src/room/state.rs @@ -21,7 +21,7 @@ pub enum RoomMembership { /// This enumeration is the list of visibility types for rooms that the user is /// a member of. #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)] -pub enum Visibility { +pub enum RoomVisibility { /// This room is visible to any user. Public, /// This room is visible only to members, and the user owns it. @@ -110,7 +110,7 @@ pub struct RoomState { /// The membership state of the user for the room. pub membership: RoomMembership, /// The visibility of the room. - pub visibility: Visibility, + pub visibility: RoomVisibility, /// True if the user is one of the room's operators, False if the user is a /// regular member. pub operated: bool, @@ -130,7 +130,7 @@ pub struct RoomState { impl RoomState { /// Creates a new room with the given visibility and user count. - pub fn new(visibility: Visibility, user_count: usize) -> Self { + pub fn new(visibility: RoomVisibility, user_count: usize) -> Self { Self { membership: RoomMembership::NonMember, visibility: visibility,