hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 22:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Iterative progress

Browse source 
* Cleaned up MessageSession code a little bit, it's still pretty
  suboptimal
* Added stub `tests` folder
* Renamed rojo_core to librojo
This commit is contained in:
Lucien Greathouse 2018-06-04 23:10:42 -07:00
parent 1dc69d81dc
commit 8cd7d990e0
5 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/src/web.rs
View file

@ -52,14 +52,14 @@ struct SubscribeResponse<'a> {
messages: &'a [Message],
}
struct Server {
pub struct Server {
config: WebConfig,
server_version: &'static str,
server_id: String,
}
impl Server {
fn new(config: WebConfig) -> Server {
pub fn new(config: WebConfig) -> Server {
Server {
server_version: env!("CARGO_PKG_VERSION"),
server_id: config.server_id.to_string(),
@ -67,7 +67,7 @@ impl Server {
}
}
fn handle_request(&self, request: &Request) -> Response {
pub fn handle_request(&self, request: &Request) -> Response {
router!(request,
(GET) (/) => {
Response::text("Rojo up and running!")
@ -145,10 +145,7 @@ impl Server {
(GET) (/api/read_all) => {
let rbx_session = self.config.rbx_session.read().unwrap();
let message_cursor = {
let messages = self.config.message_session.messages.read().unwrap();
messages.len() as i32 - 1
};
let message_cursor = self.config.message_session.get_message_cursor();
Response::json(&ReadAllResponse {
server_id: &self.server_id,
@ -165,10 +162,7 @@ impl Server {
let rbx_session = self.config.rbx_session.read().unwrap();
let message_cursor = {
let messages = self.config.message_session.messages.read().unwrap();
messages.len() as i32 - 1
};
let message_cursor = self.config.message_session.get_message_cursor();
let mut instances = HashMap::new();