Move room and user modules into server module.

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<Peer, usize>,
 }
@@ -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(),

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.

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,
   };
 

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};
 

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};

client/src/server/mod.rs

@@ -1,3 +1,5 @@
 mod login;
+pub mod room;
+pub mod user;
 
 pub use login::LoginStatus;

client/src/room/event.rs → 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};
 

client/src/room/map.rs → 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::*;