From ff24e961248d4a741faaf38011a7490b451a8c8d Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Wed, 14 Dec 2022 23:56:10 +0000 Subject: [PATCH] Move room and user modules into server module. --- client/src/client.rs | 14 +++++++------- client/src/context.rs | 4 ++-- client/src/control/response.rs | 4 ++-- client/src/dispatcher.rs | 8 ++++---- client/src/main.rs | 2 -- client/src/server/mod.rs | 2 ++ client/src/{ => server}/room/event.rs | 6 ++++-- client/src/{ => server}/room/map.rs | 6 ++++-- client/src/{ => server}/room/mod.rs | 0 client/src/{ => server}/room/state.rs | 0 client/src/{ => server}/user/event.rs | 0 client/src/{ => server}/user/map.rs | 0 client/src/{ => server}/user/mod.rs | 0 13 files changed, 25 insertions(+), 21 deletions(-) rename client/src/{ => server}/room/event.rs (99%) rename client/src/{ => server}/room/map.rs (98%) rename client/src/{ => server}/room/mod.rs (100%) rename client/src/{ => server}/room/state.rs (100%) rename client/src/{ => server}/user/event.rs (100%) rename client/src/{ => server}/user/map.rs (100%) rename client/src/{ => server}/user/mod.rs (100%) diff --git a/client/src/client.rs b/client/src/client.rs index 0d365c4..b95d37f 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -9,9 +9,9 @@ use solstice_proto::server; use crate::config::Config; use crate::control; +use crate::server::room::{RoomMap, RoomMessage}; +use crate::server::user::UserMap; use crate::server::LoginStatus; -use crate::room; -use crate::user; #[derive(Debug)] enum PeerState { @@ -49,8 +49,8 @@ pub struct Client { login_status: LoginStatus, - rooms: room::RoomMap, - users: user::UserMap, + rooms: RoomMap, + users: UserMap, peers: slab::Slab, } @@ -74,8 +74,8 @@ impl Client { login_status: LoginStatus::Todo, - rooms: room::RoomMap::new(), - users: user::UserMap::new(), + rooms: RoomMap::new(), + users: UserMap::new(), peers: slab::Slab::new(max_peers), } @@ -616,7 +616,7 @@ impl Client { } }; - let message = room::RoomMessage { + let message = RoomMessage { received_at: std::time::SystemTime::now(), user_name: response.user_name.clone(), message: response.message.clone(), diff --git a/client/src/context.rs b/client/src/context.rs index 6d5c657..6cf0f5c 100644 --- a/client/src/context.rs +++ b/client/src/context.rs @@ -9,8 +9,8 @@ use crate::clock::SimulatedSystemClock; use crate::clock::SystemClock; use crate::control::Response as ControlResponse; use crate::peer::PeerMap; -use crate::room::RoomMap; -use crate::user::UserMap; +use crate::server::room::RoomMap; +use crate::server::user::UserMap; use crate::Config; /// Contains all the different bits of client state. diff --git a/client/src/control/response.rs b/client/src/control/response.rs index 1a7ea09..0457468 100644 --- a/client/src/control/response.rs +++ b/client/src/control/response.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use solstice_proto::User; -use crate::room::{RoomMessage, RoomState}; +use crate::server::room::{RoomMessage, RoomState}; /// This enumeration is the list of possible control responses from the client /// to the controller. @@ -109,7 +109,7 @@ mod tests { use solstice_proto::{User, UserStatus}; - use crate::room::{ + use crate::server::room::{ RoomMembership, RoomMessage, RoomMessageHistory, RoomState, RoomVisibility, }; diff --git a/client/src/dispatcher.rs b/client/src/dispatcher.rs index d4cbb28..6e485a7 100644 --- a/client/src/dispatcher.rs +++ b/client/src/dispatcher.rs @@ -9,8 +9,8 @@ use crate::event::{Event, EventHandler}; use crate::handlers::*; use crate::message_handler::MessageHandler; use crate::peer::{PeerEvent, PeerEventHandler}; -use crate::room::{RoomEvent, RoomEventHandler}; -use crate::user::{UserEvent, UserEventHandler}; +use crate::server::room::{RoomEvent, RoomEventHandler}; +use crate::server::user::{UserEvent, UserEventHandler}; /// Subsystem event handlers to which the `Dispatcher` dispatches events. pub trait DispatcherHandlers { @@ -166,8 +166,8 @@ mod tests { use crate::control; use crate::event::{Event, EventHandler}; use crate::peer::PeerEvent; - use crate::room::RoomEvent; - use crate::user::UserEvent; + use crate::server::room::RoomEvent; + use crate::server::user::UserEvent; use super::{Dispatcher, DispatcherHandlers, DispatcherParts}; diff --git a/client/src/main.rs b/client/src/main.rs index 4f01e99..c6deeac 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -17,11 +17,9 @@ mod event; mod handlers; mod message_handler; mod peer; -mod room; mod server; #[cfg(test)] mod testing; -mod user; use config::{Config, TomlConfig}; use context::{ContextBundle, ContextOptions}; diff --git a/client/src/server/mod.rs b/client/src/server/mod.rs index 7dc3c78..3e75ae2 100644 --- a/client/src/server/mod.rs +++ b/client/src/server/mod.rs @@ -1,3 +1,5 @@ mod login; +pub mod room; +pub mod user; pub use login::LoginStatus; diff --git a/client/src/room/event.rs b/client/src/server/room/event.rs similarity index 99% rename from client/src/room/event.rs rename to client/src/server/room/event.rs index f104dce..9975106 100644 --- a/client/src/room/event.rs +++ b/client/src/server/room/event.rs @@ -8,7 +8,7 @@ use solstice_proto::ServerRequest; use crate::context::Context; use crate::control; use crate::event::EventHandler; -use crate::room::RoomMessage; +use crate::server::room::RoomMessage; /// An event affecting the chat room module. #[derive(Debug, PartialEq, Eq)] @@ -198,7 +198,9 @@ mod tests { use crate::context::{ContextBundle, ContextOptions}; use crate::control; use crate::event::EventHandler; - use crate::room::{RoomMembership, RoomMessage, RoomState, RoomVisibility}; + use crate::server::room::{ + RoomMembership, RoomMessage, RoomState, RoomVisibility, + }; use super::{RoomEvent, RoomEventHandler}; diff --git a/client/src/room/map.rs b/client/src/server/room/map.rs similarity index 98% rename from client/src/room/map.rs rename to client/src/server/room/map.rs index d85d3a5..f75904e 100644 --- a/client/src/room/map.rs +++ b/client/src/server/room/map.rs @@ -8,7 +8,9 @@ use log::{error, info, warn}; use solstice_proto::{server, User}; use thiserror::Error; -use crate::room::{RoomMembership, RoomMessage, RoomState, RoomVisibility}; +use crate::server::room::{ + RoomMembership, RoomMessage, RoomState, RoomVisibility, +}; #[derive(Debug, Error)] #[error("cannot change membership from {0:?} to {1:?}")] @@ -260,7 +262,7 @@ mod tests { use solstice_proto::server::RoomListResponse; - use crate::room::{RoomMembership, RoomState, RoomVisibility}; + use crate::server::room::{RoomMembership, RoomState, RoomVisibility}; use super::*; diff --git a/client/src/room/mod.rs b/client/src/server/room/mod.rs similarity index 100% rename from client/src/room/mod.rs rename to client/src/server/room/mod.rs diff --git a/client/src/room/state.rs b/client/src/server/room/state.rs similarity index 100% rename from client/src/room/state.rs rename to client/src/server/room/state.rs diff --git a/client/src/user/event.rs b/client/src/server/user/event.rs similarity index 100% rename from client/src/user/event.rs rename to client/src/server/user/event.rs diff --git a/client/src/user/map.rs b/client/src/server/user/map.rs similarity index 100% rename from client/src/user/map.rs rename to client/src/server/user/map.rs diff --git a/client/src/user/mod.rs b/client/src/server/user/mod.rs similarity index 100% rename from client/src/user/mod.rs rename to client/src/server/user/mod.rs