fix: update branch from main

crates/core/config/src/lib.rs

@@ -188,6 +188,7 @@ pub struct LiveKitNode {
     pub secret: String
 }
 
+#[derive(Deserialize, Debug, Clone)]
 pub struct ApiUsers {
     pub early_adopter_cutoff: Option<u64>
 }

crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs

@@ -1141,8 +1141,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "is_publishing": true,
                         "is_receiving": true
                     }
-                },
+                }
-                None,
             )
             .await
             .expect("Failed to update members");
@@ -1159,8 +1158,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "channel_type": "TextChannel",
                         "voice": {}
                     }
-                },
+                }
-                None
             )
             .await
             .expect("Failed to update voice channels");

crates/core/permissions/src/models/channel.rs

@@ -98,12 +98,6 @@ pub enum ChannelPermission {
     /// Mention roles
     MentionRoles = 1 << 38,
 
-    // * Channel permissions two electric boogaloo
-    /// Mention everyone and online members
-    MentionEveryone = 1 << 37,
-    /// Mention roles
-    MentionRoles = 1 << 38,
-
     // * Misc. permissions
     // % Bits 38 to 52: free area
     // % Bits 53 to 64: do not use

crates/delta/src/util/test.rs

@@ -154,6 +154,7 @@ impl TestHarness {
                 name: "Test Channel".to_string(),
                 description: None,
                 nsfw: Some(false),
+                voice: None
             },
             true,
         )
@@ -220,7 +221,7 @@ impl TestHarness {
         }
 
         let mut stream = self.sub.on_message();
-        while let Some(Ok(item)) = stream.next().await {
+        while let Some(item) = stream.next().await {
             let msg_topic = item.get_channel_name();
             let payload: EventV1 = redis_kiss::decode_payload(&item).unwrap();