refactor(global): whirl_config modulized

The config module has now become it's own crate.

4 files changed, 59 insertions, 66 deletions

diff --git a/src/server/cmd/commands/property/create.rs b/src/server/cmd/commands/property/create.rs
index 9908b27..88a9293 100644
--- a/src/server/cmd/commands/property/create.rs
+++ b/src/server/cmd/commands/property/create.rs
@@ -3,28 +3,27 @@
 
 // TODO: of2m-ify?
 
-use crate::{
-  config::Config,
-  server::{
-    cmd::constants::{PROPUPD, SESSINIT},
-    net::{
-      constants::{
-        VAR_APPNAME,
-        VAR_CHANNEL,
-        VAR_ERROR,
-        VAR_EXTERNAL_HTTP_SERVER,
-        VAR_MAIL_DOMAIN,
-        VAR_PRIV,
-        VAR_PROTOCOL,
-        VAR_SCRIPT_SERVER,
-        VAR_SERIAL,
-        VAR_SERVERTYPE,
-        VAR_SMTP_SERVER,
-        VAR_UPDATETIME,
-      },
-      converter::property_list_to_bytes,
-      structure::NetworkProperty,
+use whirl_config::Config;
+
+use crate::server::{
+  cmd::constants::{PROPUPD, SESSINIT},
+  net::{
+    constants::{
+      VAR_APPNAME,
+      VAR_CHANNEL,
+      VAR_ERROR,
+      VAR_EXTERNAL_HTTP_SERVER,
+      VAR_MAIL_DOMAIN,
+      VAR_PRIV,
+      VAR_PROTOCOL,
+      VAR_SCRIPT_SERVER,
+      VAR_SERIAL,
+      VAR_SERVERTYPE,
+      VAR_SMTP_SERVER,
+      VAR_UPDATETIME,
     },
+    converter::property_list_to_bytes,
+    structure::NetworkProperty,
   },
 };
 
diff --git a/src/server/cmd/commands/redirect_id.rs b/src/server/cmd/commands/redirect_id.rs
index e6d3ddd..edaf46e 100644
--- a/src/server/cmd/commands/redirect_id.rs
+++ b/src/server/cmd/commands/redirect_id.rs
@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use bytes::{BufMut, BytesMut};
+use whirl_config::Config;
 
-use crate::{
-  config::Config,
-  server::cmd::{constants::REDIRID, extendable::Creatable},
-};
+use crate::server::cmd::{constants::REDIRID, extendable::Creatable};
 
 #[derive(Debug)]
 pub struct RedirectId {
diff --git a/src/server/distributor.rs b/src/server/distributor.rs
index cfcaa63..4267a78 100644
--- a/src/server/distributor.rs
+++ b/src/server/distributor.rs
@@ -16,30 +16,28 @@ use std::{error::Error, net::SocketAddr, sync::Arc};
 use tokio::{io::AsyncWriteExt, net::TcpStream, sync::Mutex};
 use tokio_stream::StreamExt;
 use tokio_util::codec::{BytesCodec, Decoder};
+use whirl_config::Config;
 
-use crate::{
-  config::Config,
-  server::{
-    cmd::{
-      commands::{
-        action::create_action,
-        buddy_list::BuddyList,
-        property::{
-          create::{create_property_request_as_distributor, create_property_update_as_distributor},
-          parse::find_property_in_property_list,
-        },
-        redirect_id::RedirectId,
-        room_id_request::RoomIdRequest,
-        text::Text,
+use crate::server::{
+  cmd::{
+    commands::{
+      action::create_action,
+      buddy_list::BuddyList,
+      property::{
+        create::{create_property_request_as_distributor, create_property_update_as_distributor},
+        parse::find_property_in_property_list,
       },
-      constants::*,
-      extendable::{Creatable, Parsable},
+      redirect_id::RedirectId,
+      room_id_request::RoomIdRequest,
+      text::Text,
     },
-    interaction::{peer::Peer, shared::Shared},
-    net::{constants::VAR_USERNAME, property_parser::parse_network_property},
-    packet_parser::parse_commands_from_packet,
-    Server,
+    constants::*,
+    extendable::{Creatable, Parsable},
   },
+  interaction::{peer::Peer, shared::Shared},
+  net::{constants::VAR_USERNAME, property_parser::parse_network_property},
+  packet_parser::parse_commands_from_packet,
+  Server,
 };
 
 pub struct Distributor;
diff --git a/src/server/hub.rs b/src/server/hub.rs
index c6e5be8..99ba600 100644
--- a/src/server/hub.rs
+++ b/src/server/hub.rs
@@ -12,31 +12,29 @@ use std::{error::Error, net::SocketAddr, sync::Arc};
 use tokio::{io::AsyncWriteExt, net::TcpStream, sync::Mutex};
 use tokio_stream::StreamExt;
 use tokio_util::codec::{BytesCodec, Decoder};
+use whirl_config::Config;
 
-use crate::{
-  config::Config,
-  server::{
-    cmd::{
-      commands::{
-        action::create_action,
-        buddy_list::BuddyList,
-        property::{
-          create::{create_property_request_as_hub, create_property_update_as_hub},
-          parse::find_property_in_property_list,
-        },
-        subscribe_distance::SubscribeDistance,
-        subscribe_room::SubscribeRoom,
-        teleport::Teleport,
-        text::Text,
+use crate::server::{
+  cmd::{
+    commands::{
+      action::create_action,
+      buddy_list::BuddyList,
+      property::{
+        create::{create_property_request_as_hub, create_property_update_as_hub},
+        parse::find_property_in_property_list,
       },
-      constants::*,
-      extendable::{Creatable, Parsable, ParsableWithArguments},
+      subscribe_distance::SubscribeDistance,
+      subscribe_room::SubscribeRoom,
+      teleport::Teleport,
+      text::Text,
     },
-    interaction::{peer::Peer, shared::Shared},
-    net::{constants::VAR_USERNAME, property_parser::parse_network_property},
-    packet_parser::parse_commands_from_packet,
-    Server,
+    constants::*,
+    extendable::{Creatable, Parsable, ParsableWithArguments},
   },
+  interaction::{peer::Peer, shared::Shared},
+  net::{constants::VAR_USERNAME, property_parser::parse_network_property},
+  packet_parser::parse_commands_from_packet,
+  Server,
 };
 
 pub struct Hub;