chore: delete default_server field in bot

psychopurp · Aug 31, 2023 · 849161e · 849161e
1 parent 00dde51
commit 849161e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/crates/core/database/src/models/bots/model.rs b/crates/core/database/src/models/bots/model.rs
@@ -40,10 +40,6 @@ auto_derived_partial!(
         #[serde(skip_serializing_if = "Option::is_none")]
         pub flags: Option<i32>,
 
-        /// Bor default server
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub default_server: Option<String>,
-
         /// Bot server invite code
         #[serde(skip_serializing_if = "Option::is_none")]
         pub server_invite: Option<String>,
@@ -90,7 +86,6 @@ impl Default for Bot {
             privacy_policy_url: Default::default(),
             flags: Default::default(),
             bot_type: Default::default(),
-            default_server: Default::default(),
             server_invite: Default::default(),
         }
     }

diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
@@ -31,7 +31,6 @@ impl From<crate::Bot> for Bot {
             privacy_policy_url: value.privacy_policy_url,
             flags: value.flags.unwrap_or_default() as u32,
             bot_type: value.bot_type.map(|x| x.into()),
-            default_server: value.default_server,
             server_invite: value.server_invite,
         }
     }

diff --git a/crates/core/models/src/v0/bots.rs b/crates/core/models/src/v0/bots.rs
@@ -60,10 +60,6 @@ auto_derived!(
         )]
         pub flags: u32,
 
-        /// Bor default server
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub default_server: Option<String>,
-
         /// Bot server invite code
         #[serde(skip_serializing_if = "Option::is_none")]
         pub server_invite: Option<String>,

diff --git a/crates/delta/src/routes/bots/create.rs b/crates/delta/src/routes/bots/create.rs
@@ -66,13 +66,11 @@ pub async fn create_bot(
     let (server, channel) = create_default_channel_for_bot(db, info.name.clone(), &owner).await?;
 
     let mut invite_code: Option<String> = None;
-    let mut server_id: Option<String> = None;
 
-    if let Invite::Server { code, server, .. } =
+    if let Invite::Server { code, .. } =
         Invite::create_channel_invite(db, user.id.clone(), &channel).await?
     {
         invite_code = Some(code);
-        server_id = Some(server);
     }
 
     let bot = Bot::create(
@@ -81,7 +79,6 @@ pub async fn create_bot(
         &owner,
         PartialBot {
             bot_type: Some(bot_type.clone()),
-            default_server: server_id,
             server_invite: invite_code,
             ..Default::default()
         },