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

Use i32 to represent Postgres INTEGER types in Rust

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-02 13:58:54 +01:00
parent dec5f37e4e
commit 48b6ee313f
11 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -381,7 +381,7 @@ impl Server {
if let Some((code, count)) = invite_code {
this.peer.send(connection_id, proto::UpdateInviteInfo {
url: format!("{}{}", this.app_state.config.invite_link_prefix, code),
count,
count: count as u32,
})?;
}
}
@ -1008,7 +1008,7 @@ async fn join_project(
let collaborators = project
.collaborators
.iter()
.filter(|collaborator| collaborator.connection_id != session.connection_id.0)
.filter(|collaborator| collaborator.connection_id != session.connection_id.0 as i32)
.map(|collaborator| proto::Collaborator {
peer_id: collaborator.connection_id as u32,
replica_id: collaborator.replica_id.0 as u32,
@ -1313,7 +1313,8 @@ async fn save_buffer(
.await
.project_collaborators(project_id, session.connection_id)
.await?;
collaborators.retain(|collaborator| collaborator.connection_id != session.connection_id.0);
collaborators
.retain(|collaborator| collaborator.connection_id != session.connection_id.0 as i32);
let project_connection_ids = collaborators
.into_iter()
.map(|collaborator| ConnectionId(collaborator.connection_id as u32));