zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily join public channels as a member

Browse Source
This commit is contained in:
Conrad Irwin 2023-10-17 10:24:47 -06:00
parent 3412becfc5
commit 5b39fc8123
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/collab/src/db/queries/channels.rs
View File

@ -135,7 +135,8 @@ impl Database {
.most_public_ancestor_for_channel(channel_id, &*tx)
.await?
.unwrap_or(channel_id);
role = Some(ChannelRole::Guest);
// TODO: change this back to Guest.
role = Some(ChannelRole::Member);
joined_channel_id = Some(channel_id_to_join);
channel_member::Entity::insert(channel_member::ActiveModel {
@ -789,7 +790,7 @@ impl Database {
user_id: UserId,
tx: &DatabaseTransaction,
) -> Result<()> {
match dbg!(self.channel_role_for_user(channel_id, user_id, tx).await)? {
match self.channel_role_for_user(channel_id, user_id, tx).await? {
Some(ChannelRole::Admin) => Ok(()),
Some(ChannelRole::Member)
| Some(ChannelRole::Banned)

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

@ -2720,10 +2720,8 @@ async fn join_channel_internal(
channel_id: joined_room.channel_id.map(|id| id.to_proto()),
live_kit_connection_info,
})?;
dbg!("Joined channel", &joined_channel);
if let Some(joined_channel) = joined_channel {
dbg!("CMU");
channel_membership_updated(db, joined_channel, &session).await?
}