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

Allow setting a channel for new users to auto-join (#9291)

Browse source 
Release Notes:

- Automatically add new users to the #zed channel
This commit is contained in:
Conrad Irwin 2024-03-13 11:11:31 -06:00 • committed by GitHub
parent 88e33a1dbe
commit 77de5689a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab/src/db/queries/contributors.rs
View file

@ -65,6 +65,7 @@ impl Database {
github_login: &str,
github_user_id: Option<i32>,
github_email: Option<&str>,
initial_channel_id: Option<ChannelId>,
) -> Result<()> {
self.transaction(|tx| async move {
let user = self
@ -72,6 +73,7 @@ impl Database {
github_login,
github_user_id,
github_email,
initial_channel_id,
&tx,
)
.await?;

14
crates/collab/src/db/queries/users.rs
View file

@ -74,12 +74,14 @@ impl Database {
github_login: &str,
github_user_id: Option<i32>,
github_email: Option<&str>,
initial_channel_id: Option<ChannelId>,
) -> Result<User> {
self.transaction(|tx| async move {
self.get_or_create_user_by_github_account_tx(
github_login,
github_user_id,
github_email,
initial_channel_id,
&tx,
)
.await
@ -92,6 +94,7 @@ impl Database {
github_login: &str,
github_user_id: Option<i32>,
github_email: Option<&str>,
initial_channel_id: Option<ChannelId>,
tx: &DatabaseTransaction,
) -> Result<User> {
if let Some(github_user_id) = github_user_id {
@ -124,6 +127,17 @@ impl Database {
})
.exec_with_returning(tx)
.await?;
if let Some(channel_id) = initial_channel_id {
channel_member::Entity::insert(channel_member::ActiveModel {
id: ActiveValue::NotSet,
channel_id: ActiveValue::Set(channel_id),
user_id: ActiveValue::Set(user.id),
accepted: ActiveValue::Set(true),
role: ActiveValue::Set(ChannelRole::Guest),
})
.exec(tx)
.await?;
}
Ok(user)
}
} else {