Temporarily join public channels as a member

Conrad Irwin created 2 years ago

Change summary

crates/collab/src/db/queries/channels.rs | 5 +++--
crates/collab/src/rpc.rs                 | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)

Detailed changes

crates/collab/src/db/queries/channels.rs

@@ -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)

crates/collab/src/rpc.rs

@@ -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?
         }