From 783f05172b5361d96a1fff0c73dc0fa94b243ab2 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 17 Oct 2023 15:40:23 -0600
Subject: [PATCH] Make sure guests join as guests

---
 crates/collab/src/db/queries/channels.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/collab/src/db/queries/channels.rs b/crates/collab/src/db/queries/channels.rs
index ee989b2ea068ff362adc635e7616b1c25a2de573..d64d97f2ad6dacfae040c159905706b43b4f8c41 100644
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -135,8 +135,7 @@ impl Database {
                     .most_public_ancestor_for_channel(channel_id, &*tx)
                     .await?
                     .unwrap_or(channel_id);
-                // TODO: change this back to Guest.
-                role = Some(ChannelRole::Member);
+                role = Some(ChannelRole::Guest);
                 joined_channel_id = Some(channel_id_to_join);
 
                 channel_member::Entity::insert(channel_member::ActiveModel {
@@ -144,8 +143,7 @@ impl Database {
                     channel_id: ActiveValue::Set(channel_id_to_join),
                     user_id: ActiveValue::Set(user_id),
                     accepted: ActiveValue::Set(true),
-                    // TODO: change this back to Guest.
-                    role: ActiveValue::Set(ChannelRole::Member),
+                    role: ActiveValue::Set(ChannelRole::Guest),
                 })
                 .exec(&*tx)
                 .await?;