fmt: Rename re_server module to server

45 files changed, 18 insertions, 18 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 54ef384..692028c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,5 +11,5 @@ pub mod cli;
 pub mod config;
 
 pub mod db;
-pub mod re_server;
+pub mod server;
 pub mod utils;
diff --git a/src/main.rs b/src/main.rs
index d7b572b..3113704 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,7 +11,7 @@ use whirl::{
   cli::cli,
   config,
   config::get_config,
-  re_server::{
+  server::{
     distributor::Distributor,
     hub::Hub,
     server::{
diff --git a/src/re_server/cmd/commands/action.rs b/src/server/cmd/commands/action.rs
index 99da54f..99da54f 100644
--- a/src/re_server/cmd/commands/action.rs
+++ b/src/server/cmd/commands/action.rs
diff --git a/src/re_server/cmd/commands/buddy_list/create.rs b/src/server/cmd/commands/buddy_list/create.rs
index e201cbb..bc4b10a 100644
--- a/src/re_server/cmd/commands/buddy_list/create.rs
+++ b/src/server/cmd/commands/buddy_list/create.rs
@@ -3,7 +3,7 @@
 
 use bytes::{BufMut, BytesMut};
 
-use crate::re_server::cmd::{commands::buddy_list::structure::Buddy, constants::BUDDYLISTNOTIFY};
+use crate::server::cmd::{commands::buddy_list::structure::Buddy, constants::BUDDYLISTNOTIFY};
 
 pub fn create_buddy_list_notify(buddy: &Buddy) -> Vec<u8> {
   let mut command = BytesMut::new();
diff --git a/src/re_server/cmd/commands/buddy_list/mod.rs b/src/server/cmd/commands/buddy_list/mod.rs
index 14440dc..14440dc 100644
--- a/src/re_server/cmd/commands/buddy_list/mod.rs
+++ b/src/server/cmd/commands/buddy_list/mod.rs
diff --git a/src/re_server/cmd/commands/buddy_list/parse.rs b/src/server/cmd/commands/buddy_list/parse.rs
index 6705aaa..163052c 100644
--- a/src/re_server/cmd/commands/buddy_list/parse.rs
+++ b/src/server/cmd/commands/buddy_list/parse.rs
@@ -3,7 +3,7 @@
 
 use std::str::from_utf8;
 
-use crate::re_server::cmd::commands::buddy_list::structure::Buddy;
+use crate::server::cmd::commands::buddy_list::structure::Buddy;
 
 pub fn parse_buddy_list_update(data: Vec<u8>) -> Buddy {
   Buddy {
diff --git a/src/re_server/cmd/commands/buddy_list/structure.rs b/src/server/cmd/commands/buddy_list/structure.rs
index 5da24d5..5da24d5 100644
--- a/src/re_server/cmd/commands/buddy_list/structure.rs
+++ b/src/server/cmd/commands/buddy_list/structure.rs
diff --git a/src/re_server/cmd/commands/mod.rs b/src/server/cmd/commands/mod.rs
index b484e2f..b484e2f 100644
--- a/src/re_server/cmd/commands/mod.rs
+++ b/src/server/cmd/commands/mod.rs
diff --git a/src/re_server/cmd/commands/property/create.rs b/src/server/cmd/commands/property/create.rs
index 9ea1dec..8521a8e 100644
--- a/src/re_server/cmd/commands/property/create.rs
+++ b/src/server/cmd/commands/property/create.rs
@@ -3,7 +3,7 @@
 
 use crate::{
   config::get_config,
-  re_server::{
+  server::{
     cmd::constants::{PROPUPD, SESSINIT},
     net::{
       constants::{
diff --git a/src/re_server/cmd/commands/property/mod.rs b/src/server/cmd/commands/property/mod.rs
index 0bea58f..0bea58f 100644
--- a/src/re_server/cmd/commands/property/mod.rs
+++ b/src/server/cmd/commands/property/mod.rs
diff --git a/src/re_server/cmd/commands/property/parse.rs b/src/server/cmd/commands/property/parse.rs
index 50bde06..1d48db0 100644
--- a/src/re_server/cmd/commands/property/parse.rs
+++ b/src/server/cmd/commands/property/parse.rs
@@ -1,7 +1,7 @@
 // Copyleft 2021-2021 Whirlsplash
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::re_server::net::structure::NetworkProperty;
+use crate::server::net::structure::NetworkProperty;
 
 pub fn find_property_in_property_list(
   property_list: &[NetworkProperty],
diff --git a/src/re_server/cmd/commands/register_object_id/create.rs b/src/server/cmd/commands/register_object_id/create.rs
index 858d572..858d572 100644
--- a/src/re_server/cmd/commands/register_object_id/create.rs
+++ b/src/server/cmd/commands/register_object_id/create.rs
diff --git a/src/re_server/cmd/commands/register_object_id/mod.rs b/src/server/cmd/commands/register_object_id/mod.rs
index 08317e1..08317e1 100644
--- a/src/re_server/cmd/commands/register_object_id/mod.rs
+++ b/src/server/cmd/commands/register_object_id/mod.rs
diff --git a/src/re_server/cmd/commands/room/create.rs b/src/server/cmd/commands/room/create.rs
index 8cfb960..a195936 100644
--- a/src/re_server/cmd/commands/room/create.rs
+++ b/src/server/cmd/commands/room/create.rs
@@ -3,7 +3,7 @@
 
 use bytes::{BufMut, BytesMut};
 
-use crate::{config::get_config, re_server::cmd::constants::REDIRID};
+use crate::{config::get_config, server::cmd::constants::REDIRID};
 
 pub fn create_room_id_request(room: &str, room_id: u8) -> Vec<u8> {
   let mut command = BytesMut::new();
diff --git a/src/re_server/cmd/commands/room/mod.rs b/src/server/cmd/commands/room/mod.rs
index 0bea58f..0bea58f 100644
--- a/src/re_server/cmd/commands/room/mod.rs
+++ b/src/server/cmd/commands/room/mod.rs
diff --git a/src/re_server/cmd/commands/room/parse.rs b/src/server/cmd/commands/room/parse.rs
index 70bd0a8..70bd0a8 100644
--- a/src/re_server/cmd/commands/room/parse.rs
+++ b/src/server/cmd/commands/room/parse.rs
diff --git a/src/re_server/cmd/commands/session/mod.rs b/src/server/cmd/commands/session/mod.rs
index 858d572..858d572 100644
--- a/src/re_server/cmd/commands/session/mod.rs
+++ b/src/server/cmd/commands/session/mod.rs
diff --git a/src/re_server/cmd/commands/session/parse.rs b/src/server/cmd/commands/session/parse.rs
index 858d572..858d572 100644
--- a/src/re_server/cmd/commands/session/parse.rs
+++ b/src/server/cmd/commands/session/parse.rs
diff --git a/src/re_server/cmd/commands/session/structure.rs b/src/server/cmd/commands/session/structure.rs
index 858d572..858d572 100644
--- a/src/re_server/cmd/commands/session/structure.rs
+++ b/src/server/cmd/commands/session/structure.rs
diff --git a/src/re_server/cmd/commands/subscribe/mod.rs b/src/server/cmd/commands/subscribe/mod.rs
index d7fec55..d7fec55 100644
--- a/src/re_server/cmd/commands/subscribe/mod.rs
+++ b/src/server/cmd/commands/subscribe/mod.rs
diff --git a/src/re_server/cmd/commands/subscribe/parse.rs b/src/server/cmd/commands/subscribe/parse.rs
index 657b4ba..2a17cb2 100644
--- a/src/re_server/cmd/commands/subscribe/parse.rs
+++ b/src/server/cmd/commands/subscribe/parse.rs
@@ -4,7 +4,7 @@
 use byteorder::{BigEndian, ReadBytesExt};
 use bytes::{Buf, BytesMut};
 
-use crate::re_server::cmd::commands::subscribe::structure::SubscribeRoom;
+use crate::server::cmd::commands::subscribe::structure::SubscribeRoom;
 
 /// TODO: The functionality of this function has not been tested... TEST IT!
 pub fn parse_subscribe_room(data: Vec<u8>) -> SubscribeRoom {
diff --git a/src/re_server/cmd/commands/subscribe/structure.rs b/src/server/cmd/commands/subscribe/structure.rs
index 6142aaa..6142aaa 100644
--- a/src/re_server/cmd/commands/subscribe/structure.rs
+++ b/src/server/cmd/commands/subscribe/structure.rs
diff --git a/src/re_server/cmd/commands/text/create.rs b/src/server/cmd/commands/text/create.rs
index 6e1a5a8..879f9bd 100644
--- a/src/re_server/cmd/commands/text/create.rs
+++ b/src/server/cmd/commands/text/create.rs
@@ -3,7 +3,7 @@
 
 use bytes::{BufMut, BytesMut};
 
-use crate::re_server::cmd::{commands::text::structure::Text, constants::TEXT};
+use crate::server::cmd::{commands::text::structure::Text, constants::TEXT};
 
 pub fn create_text(text: Text) -> Vec<u8> {
   let mut command = BytesMut::new();
diff --git a/src/re_server/cmd/commands/text/mod.rs b/src/server/cmd/commands/text/mod.rs
index 14440dc..14440dc 100644
--- a/src/re_server/cmd/commands/text/mod.rs
+++ b/src/server/cmd/commands/text/mod.rs
diff --git a/src/re_server/cmd/commands/text/parse.rs b/src/server/cmd/commands/text/parse.rs
index 078c19f..a7f66d0 100644
--- a/src/re_server/cmd/commands/text/parse.rs
+++ b/src/server/cmd/commands/text/parse.rs
@@ -3,7 +3,7 @@
 
 use std::str::from_utf8;
 
-use crate::re_server::cmd::commands::text::structure::Text;
+use crate::server::cmd::commands::text::structure::Text;
 
 pub fn parse_text(data: Vec<u8>, username: &str) -> Text {
   Text {
diff --git a/src/re_server/cmd/commands/text/structure.rs b/src/server/cmd/commands/text/structure.rs
index eaeef38..eaeef38 100644
--- a/src/re_server/cmd/commands/text/structure.rs
+++ b/src/server/cmd/commands/text/structure.rs
diff --git a/src/re_server/cmd/commands/whisper.rs b/src/server/cmd/commands/whisper.rs
index 858d572..858d572 100644
--- a/src/re_server/cmd/commands/whisper.rs
+++ b/src/server/cmd/commands/whisper.rs
diff --git a/src/re_server/cmd/constants.rs b/src/server/cmd/constants.rs
index 0db4143..0db4143 100644
--- a/src/re_server/cmd/constants.rs
+++ b/src/server/cmd/constants.rs
diff --git a/src/re_server/cmd/mod.rs b/src/server/cmd/mod.rs
index c01f582..c01f582 100644
--- a/src/re_server/cmd/mod.rs
+++ b/src/server/cmd/mod.rs
diff --git a/src/re_server/cmd/set_parser.rs b/src/server/cmd/set_parser.rs
index 94ea51e..c998dcc 100644
--- a/src/re_server/cmd/set_parser.rs
+++ b/src/server/cmd/set_parser.rs
@@ -1,7 +1,7 @@
 // Copyleft 2021-2021 Whirlsplash
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::re_server::cmd::structure::Command;
+use crate::server::cmd::structure::Command;
 
 /// Iterate over a command set in the from of bytes and return a list of
 /// human-readable commands.
diff --git a/src/re_server/cmd/structure.rs b/src/server/cmd/structure.rs
index ea6bc0c..ea6bc0c 100644
--- a/src/re_server/cmd/structure.rs
+++ b/src/server/cmd/structure.rs
diff --git a/src/re_server/distributor.rs b/src/server/distributor.rs
index d952fb7..4e7a694 100644
--- a/src/re_server/distributor.rs
+++ b/src/server/distributor.rs
@@ -19,7 +19,7 @@ use tokio_util::codec::{BytesCodec, Decoder};
 
 use crate::{
   config::get_config,
-  re_server::{
+  server::{
     cmd::{
       commands::{
         action::create_action,
diff --git a/src/re_server/hub.rs b/src/server/hub.rs
index a9c30bd..6a1480f 100644
--- a/src/re_server/hub.rs
+++ b/src/server/hub.rs
@@ -15,7 +15,7 @@ use tokio_util::codec::{BytesCodec, Decoder};
 
 use crate::{
   config::get_config,
-  re_server::{
+  server::{
     cmd::{
       commands::{
         action::create_action,
diff --git a/src/re_server/interaction/mod.rs b/src/server/interaction/mod.rs
index 4f0f38b..4f0f38b 100644
--- a/src/re_server/interaction/mod.rs
+++ b/src/server/interaction/mod.rs
diff --git a/src/re_server/interaction/peer.rs b/src/server/interaction/peer.rs
index 898c5c8..c0f5223 100644
--- a/src/re_server/interaction/peer.rs
+++ b/src/server/interaction/peer.rs
@@ -9,7 +9,7 @@ use tokio::{
 };
 use tokio_util::codec::{BytesCodec, Framed};
 
-use crate::re_server::{interaction::shared::Shared, types::Rx};
+use crate::server::{interaction::shared::Shared, types::Rx};
 
 pub struct Peer {
   pub bytes: Framed<TcpStream, BytesCodec>,
diff --git a/src/re_server/interaction/shared.rs b/src/server/interaction/shared.rs
index 9af6952..fec5980 100644
--- a/src/re_server/interaction/shared.rs
+++ b/src/server/interaction/shared.rs
@@ -5,7 +5,7 @@ use std::collections::HashMap;
 
 use bytes::BytesMut;
 
-use crate::re_server::types::Tx;
+use crate::server::types::Tx;
 
 pub struct Shared {
   pub peers: HashMap<String, Tx>,
diff --git a/src/re_server/mod.rs b/src/server/mod.rs
index 8cd477d..8cd477d 100644
--- a/src/re_server/mod.rs
+++ b/src/server/mod.rs
diff --git a/src/re_server/net/constants.rs b/src/server/net/constants.rs
index 04d94a9..04d94a9 100644
--- a/src/re_server/net/constants.rs
+++ b/src/server/net/constants.rs
diff --git a/src/re_server/net/converter.rs b/src/server/net/converter.rs
index 7087bc1..148a35e 100644
--- a/src/re_server/net/converter.rs
+++ b/src/server/net/converter.rs
@@ -3,7 +3,7 @@
 
 use bytes::{BufMut, BytesMut};
 
-use crate::re_server::{
+use crate::server::{
   cmd::constants::PROPUPD,
   net::{
     constants::{PROPACCESS_POSSESS, PROPFLAG_DBSTORE},
diff --git a/src/re_server/net/mod.rs b/src/server/net/mod.rs
index c88ab7f..c88ab7f 100644
--- a/src/re_server/net/mod.rs
+++ b/src/server/net/mod.rs
diff --git a/src/re_server/net/property_parser.rs b/src/server/net/property_parser.rs
index ff03643..8a4f960 100644
--- a/src/re_server/net/property_parser.rs
+++ b/src/server/net/property_parser.rs
@@ -3,7 +3,7 @@
 
 use std::str::from_utf8;
 
-use crate::re_server::net::structure::NetworkProperty;
+use crate::server::net::structure::NetworkProperty;
 
 /// Iterate over a network property in the form of bytes and return a list of
 /// human-readable properties.
diff --git a/src/re_server/net/structure.rs b/src/server/net/structure.rs
index 0128c0e..0128c0e 100644
--- a/src/re_server/net/structure.rs
+++ b/src/server/net/structure.rs
diff --git a/src/re_server/packet_parser.rs b/src/server/packet_parser.rs
index d8fd93d..d8fd93d 100644
--- a/src/re_server/packet_parser.rs
+++ b/src/server/packet_parser.rs
diff --git a/src/re_server/server.rs b/src/server/server.rs
index 1e64476..1a6f65b 100644
--- a/src/re_server/server.rs
+++ b/src/server/server.rs
@@ -8,7 +8,7 @@ use tokio::{
   sync::Mutex,
 };
 
-use crate::re_server::interaction::shared::Shared;
+use crate::server::interaction::shared::Shared;
 
 #[derive(Debug)]
 pub enum ServerType {
diff --git a/src/re_server/types.rs b/src/server/types.rs
index 8330875..8330875 100644
--- a/src/re_server/types.rs
+++ b/src/server/types.rs