summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <happydooby@gmail.com>2019-05-04 08:53:29 -0700
committerDessalines <happydooby@gmail.com>2019-05-04 08:53:29 -0700
commit3ebd457a171c7d481bc7b50a44c2809833a4de8e (patch)
tree5035e556b6a141ecd1c4abd31a05b5eb73f04f9b
parent67eae4203f40d2e8d1537c8e72e5233dd7f6a0a1 (diff)
More reorg
-rw-r--r--server/src/main.rs8
-rw-r--r--server/src/websocket/server.rs1
2 files changed, 8 insertions, 1 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index 3e51785b..add17cfd 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -29,7 +29,13 @@ fn chat_route(req: &HttpRequest<WsChatSessionState>) -> Result<HttpResponse, Err
WSSession {
id: 0,
hb: Instant::now(),
- ip: req.connection_info().remote().unwrap_or("127.0.0.1:12345").split(":").next().unwrap_or("127.0.0.1").to_string()
+ ip: req.connection_info()
+ .remote()
+ .unwrap_or("127.0.0.1:12345")
+ .split(":")
+ .next()
+ .unwrap_or("127.0.0.1")
+ .to_string()
},
)
}
diff --git a/server/src/websocket/server.rs b/server/src/websocket/server.rs
index a530b9a6..07378d37 100644
--- a/server/src/websocket/server.rs
+++ b/server/src/websocket/server.rs
@@ -1233,6 +1233,7 @@ impl Perform for GetPost {
sessions.remove(&addr);
}
+ // If the room doesn't exist yet
if chat.rooms.get_mut(&self.id).is_none() {
chat.rooms.insert(self.id, HashSet::new());
}