aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-05-06 11:39:59 +0000
committerFuwn <[email protected]>2021-05-06 11:39:59 +0000
commit1643fb945fd5d7951578159124b15e072958adc2 (patch)
tree3e4f163c71d69ba007c32407419cff5adbbd4f10 /src/server
parentrefactor(server): clippy: module inception (diff)
downloadwhirl-1643fb945fd5d7951578159124b15e072958adc2.tar.xz
whirl-1643fb945fd5d7951578159124b15e072958adc2.zip
fix(docker): the dockering
Fix Docker functionalities.
Diffstat (limited to 'src/server')
-rw-r--r--src/server/cmd/commands/property/create.rs6
-rw-r--r--src/server/cmd/commands/redirect_id.rs4
-rw-r--r--src/server/distributor.rs4
-rw-r--r--src/server/hub.rs4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/server/cmd/commands/property/create.rs b/src/server/cmd/commands/property/create.rs
index e4c4eb2..9908b27 100644
--- a/src/server/cmd/commands/property/create.rs
+++ b/src/server/cmd/commands/property/create.rs
@@ -59,7 +59,7 @@ pub fn create_property_update_as_distributor() -> Vec<u8> {
},
NetworkProperty {
prop_id: VAR_APPNAME,
- value: Config::get().unwrap().whirlsplash.worldsmaster_username,
+ value: Config::get().whirlsplash.worldsmaster_username,
},
],
)
@@ -100,7 +100,7 @@ pub fn create_property_update_as_hub() -> Vec<u8> {
},
NetworkProperty {
prop_id: VAR_APPNAME,
- value: Config::get().unwrap().whirlsplash.worldsmaster_username,
+ value: Config::get().whirlsplash.worldsmaster_username,
},
],
)
@@ -117,7 +117,7 @@ pub fn create_property_request_as_distributor() -> Vec<u8> {
},
NetworkProperty {
prop_id: VAR_APPNAME,
- value: Config::get().unwrap().whirlsplash.worldsmaster_username,
+ value: Config::get().whirlsplash.worldsmaster_username,
},
NetworkProperty {
prop_id: VAR_PROTOCOL,
diff --git a/src/server/cmd/commands/redirect_id.rs b/src/server/cmd/commands/redirect_id.rs
index fdcf859..e6d3ddd 100644
--- a/src/server/cmd/commands/redirect_id.rs
+++ b/src/server/cmd/commands/redirect_id.rs
@@ -29,10 +29,10 @@ impl Creatable for RedirectId {
command.put_u16(self.room_number as u16); // Room ID
// IP
- for byte in Config::get().unwrap().whirlsplash.ip.split('.') {
+ for byte in Config::get().whirlsplash.ip.split('.') {
command.put_u8(byte.parse::<u8>().unwrap());
}
- command.put_u16(Config::get().unwrap().hub.port as u16); // Port
+ command.put_u16(Config::get().hub.port as u16); // Port
// Length
let mut command_as_vec = command.to_vec();
diff --git a/src/server/distributor.rs b/src/server/distributor.rs
index e84afeb..26bc87f 100644
--- a/src/server/distributor.rs
+++ b/src/server/distributor.rs
@@ -89,8 +89,8 @@ impl Server for Distributor {
peer.bytes.get_mut()
.write_all(&Text {
- sender: Config::get()?.whirlsplash.worldsmaster_username,
- content: Config::get()?.distributor.worldsmaster_greeting,
+ sender: Config::get().whirlsplash.worldsmaster_username,
+ content: Config::get().distributor.worldsmaster_greeting,
}.create()).await?;
peer.bytes.get_mut()
.write_all(&create_action()).await?;
diff --git a/src/server/hub.rs b/src/server/hub.rs
index b2b176e..ef72877 100644
--- a/src/server/hub.rs
+++ b/src/server/hub.rs
@@ -88,8 +88,8 @@ impl Server for Hub {
peer.bytes.get_mut()
.write_all(&Text {
- sender: Config::get()?.whirlsplash.worldsmaster_username,
- content: Config::get()?.distributor.worldsmaster_greeting,
+ sender: Config::get().whirlsplash.worldsmaster_username,
+ content: Config::get().distributor.worldsmaster_greeting,
}.create()).await?;
peer.bytes.get_mut()
.write_all(&create_action()).await?;