format: Move server type specific functions to correct modules

9 files changed, 8 insertions, 7 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 510feb6..cf812d0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,6 @@
 #[macro_use]
 extern crate log;
 
-pub mod cmd;
 pub mod db;
 pub mod server;
 pub mod utils;
diff --git a/src/server/auto/cmd/mod.rs b/src/server/auto/cmd/mod.rs
index addf7a5..5430662 100644
--- a/src/server/auto/cmd/mod.rs
+++ b/src/server/auto/cmd/mod.rs
@@ -1 +1,2 @@
+pub mod property;
 pub mod room;
diff --git a/src/cmd/property.rs b/src/server/auto/cmd/property.rs
index 01d4f43..01d4f43 100644
--- a/src/cmd/property.rs
+++ b/src/server/auto/cmd/property.rs
diff --git a/src/server/auto/server.rs b/src/server/auto/server.rs
index d9a8d0e..381852f 100644
--- a/src/server/auto/server.rs
+++ b/src/server/auto/server.rs
@@ -3,9 +3,9 @@ use std::io::{Read, Write};
 use mio::{Poll, Token, Ready, PollOpt, Events};
 use std::collections::{HashMap, HashSet};
 use std::str::from_utf8;
-use crate::cmd::buddy_list::create_buddy_list_notify_command;
-use crate::cmd::text::{create_text_command, create_text_command_with_action};
-use crate::cmd::property::{create_property_update_command, create_property_request_command};
+use crate::server::cmd::buddy_list::create_buddy_list_notify_command;
+use crate::server::cmd::text::{create_text_command, create_text_command_with_action};
+use super::cmd::property::{create_property_update_command, create_property_request_command};
 use super::cmd::room::create_room_id_redirect_command;
 use rand::Rng;
 use crate::server::utils::broadcast_to_all_clients;
diff --git a/src/cmd/buddy_list.rs b/src/server/cmd/buddy_list.rs
index 1423808..1423808 100644
--- a/src/cmd/buddy_list.rs
+++ b/src/server/cmd/buddy_list.rs
diff --git a/src/cmd/mod.rs b/src/server/cmd/mod.rs
index 05e4344..c211484 100644
--- a/src/cmd/mod.rs
+++ b/src/server/cmd/mod.rs
@@ -1,3 +1,3 @@
 pub mod buddy_list;
-pub mod property;
+// pub mod property;
 pub mod text;
diff --git a/src/cmd/text.rs b/src/server/cmd/text.rs
index a0ada32..a0ada32 100644
--- a/src/cmd/text.rs
+++ b/src/server/cmd/text.rs
diff --git a/src/server/mod.rs b/src/server/mod.rs
index e741e07..cb241f2 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -1,3 +1,4 @@
 pub mod auto;
+pub mod cmd;
 pub mod room;
 pub mod utils;
diff --git a/src/server/room/server.rs b/src/server/room/server.rs
index 4e857a3..c005e40 100644
--- a/src/server/room/server.rs
+++ b/src/server/room/server.rs
@@ -3,8 +3,8 @@ use std::io::{Read, Write};
 use mio::{Poll, Token, Ready, PollOpt, Events};
 use std::collections::HashMap;
 use std::str::from_utf8;
-use crate::cmd::buddy_list::create_buddy_list_notify_command;
-use crate::cmd::text::create_text_command;
+use crate::server::cmd::buddy_list::create_buddy_list_notify_command;
+use crate::server::cmd::text::create_text_command;
 // use crate::cmd::property::{create_property_update_command, create_property_request_command};
 use crate::server::room::cmd::property::{create_property_update_command, create_property_request_command};
 use rand::Rng;