From 16f8975b18e126f45d03ee84be6560f4bb8fde26 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Wed, 27 Feb 2019 14:51:53 -0800 Subject: [PATCH] Flip project field of LiveSession private to prepare for multi-project future --- server/src/live_session.rs | 7 ++++++- server/src/web/api.rs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/src/live_session.rs b/server/src/live_session.rs index 957a2d37..50e83c9a 100644 --- a/server/src/live_session.rs +++ b/server/src/live_session.rs @@ -1,4 +1,5 @@ use std::{ + collections::HashSet, mem, sync::{Arc, Mutex}, }; @@ -32,7 +33,7 @@ impl_from!(LiveSessionError { /// Contains all of the state for a Rojo live-sync session. pub struct LiveSession { - pub project: Arc, + project: Arc, pub session_id: SessionId, pub message_queue: Arc>, pub rbx_session: Arc>, @@ -83,4 +84,8 @@ impl LiveSession { Ok(()) } + + pub fn serve_place_ids(&self) -> &Option> { + &self.project.serve_place_ids + } } \ No newline at end of file diff --git a/server/src/web/api.rs b/server/src/web/api.rs index 2bbc96f2..58da6ecb 100644 --- a/server/src/web/api.rs +++ b/server/src/web/api.rs @@ -145,7 +145,7 @@ impl ApiService { server_version: self.server_version, protocol_version: 2, session_id: self.live_session.session_id, - expected_place_ids: self.live_session.project.serve_place_ids.clone(), + expected_place_ids: self.live_session.serve_place_ids().clone(), root_instance_id: tree.get_root_id(), }) }