zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 15:44:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename first_connection to connected_once

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-05-20 17:35:00 +02:00
parent 0597c662e4
commit b751156cd7
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/collab/migrations/20220518151305_add_invites_to_users.sql
View File

@ -2,7 +2,7 @@ ALTER TABLE users
ADD invite_code VARCHAR(64),
ADD invite_count INTEGER NOT NULL DEFAULT 0,
ADD inviter_id INTEGER REFERENCES users (id),
ADD first_connection BOOLEAN NOT NULL DEFAULT true,
ADD connected_once BOOLEAN NOT NULL DEFAULT false,
ADD created_at TIMESTAMP NOT NULL DEFAULT NOW();
CREATE UNIQUE INDEX "index_invite_code_users" ON "users" ("invite_code");

20
crates/collab/src/db.rs
View File

@ -18,7 +18,7 @@ pub trait Db: Send + Sync {
async fn get_users_by_ids(&self, ids: Vec<UserId>) -> Result<Vec<User>>;
async fn get_user_by_github_login(&self, github_login: &str) -> Result<Option<User>>;
async fn set_user_is_admin(&self, id: UserId, is_admin: bool) -> Result<()>;
async fn set_user_first_connection(&self, id: UserId, first_connection: bool) -> Result<()>;
async fn set_user_connected_once(&self, id: UserId, connected_once: bool) -> Result<()>;
async fn destroy_user(&self, id: UserId) -> Result<()>;
async fn set_invite_count(&self, id: UserId, count: u32) -> Result<()>;
@ -183,10 +183,10 @@ impl Db for PostgresDb {
.map(drop)?)
}
async fn set_user_first_connection(&self, id: UserId, first_connection: bool) -> Result<()> {
let query = "UPDATE users SET first_connection = $1 WHERE id = $2";
async fn set_user_connected_once(&self, id: UserId, connected_once: bool) -> Result<()> {
let query = "UPDATE users SET connected_once = $1 WHERE id = $2";
Ok(sqlx::query(query)
.bind(first_connection)
.bind(connected_once)
.bind(id.0)
.execute(&self.pool)
.await
@ -858,7 +858,7 @@ pub struct User {
pub admin: bool,
pub invite_code: Option<String>,
pub invite_count: i32,
pub first_connection: bool,
pub connected_once: bool,
}
id_type!(OrgId);
@ -1613,7 +1613,7 @@ pub mod tests {
admin,
invite_code: None,
invite_count: 0,
first_connection: true,
connected_once: false,
},
);
Ok(user_id)
@ -1651,17 +1651,13 @@ pub mod tests {
unimplemented!()
}
async fn set_user_first_connection(
&self,
id: UserId,
first_connection: bool,
) -> Result<()> {
async fn set_user_connected_once(&self, id: UserId, connected_once: bool) -> Result<()> {
self.background.simulate_random_delay().await;
let mut users = self.users.lock();
let mut user = users
.get_mut(&id)
.ok_or_else(|| anyhow!("user not found"))?;
user.first_connection = first_connection;
user.connected_once = connected_once;
Ok(())
}

4
crates/collab/src/rpc.rs
View File

@ -280,9 +280,9 @@ impl Server {
let _ = send_connection_id.send(connection_id).await;
}
if user.first_connection {
if !user.connected_once {
this.peer.send(connection_id, proto::ShowContacts {})?;
this.app_state.db.set_user_first_connection(user_id, false).await?;
this.app_state.db.set_user_connected_once(user_id, true).await?;
}
let (contacts, invite_code) = future::try_join(