Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix prevention of cross-channel joins

Browse source 
Co-Authored-By: Max <max@zed.dev>
This commit is contained in:
Conrad Irwin 2024-01-08 11:14:25 -07:00
parent 3541dd8a6d
commit ed76315387
4 changed files with 54 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/collab/src/rpc.rs
View file

@ -104,6 +104,7 @@ impl<R: RequestMessage> Response<R> {
#[derive(Clone)]
struct Session {
zed_environment: Arc<str>,
user_id: UserId,
connection_id: ConnectionId,
db: Arc<tokio::sync::Mutex<DbHandle>>,
@ -609,6 +610,7 @@ impl Server {
user_id,
connection_id,
db: Arc::new(tokio::sync::Mutex::new(DbHandle(this.app_state.db.clone()))),
zed_environment: this.app_state.config.zed_environment.clone(),
peer: this.peer.clone(),
connection_pool: this.connection_pool.clone(),
live_kit_client: this.app_state.live_kit_client.clone(),
@ -999,7 +1001,7 @@ async fn join_room(
room_id,
session.user_id,
session.connection_id,
RELEASE_CHANNEL_NAME.as_str(),
session.zed_environment.as_ref(),
)
.await?;
room_updated(&room.room, &session.peer);
@ -2608,7 +2610,7 @@ async fn join_channel_internal(
channel_id,
session.user_id,
session.connection_id,
RELEASE_CHANNEL_NAME.as_str(),
session.zed_environment.as_ref(),
)
.await?;