chore: update rauth

.env

@@ -1,79 +0,0 @@
-# MongoDB URI
-MONGODB=mongodb://localhost
-
-# URL to where the Revolt app is publicly accessible
-REVOLT_APP_URL=http://local.revolt.chat:5000
-
-# URL to where the API is publicly accessible
-REVOLT_PUBLIC_URL=http://local.revolt.chat:8000
-VITE_API_URL=http://local.revolt.chat:8000
-
-# URL to where the WebSocket server is publicly accessible
-REVOLT_EXTERNAL_WS_URL=ws://local.revolt.chat:9000
-
-# URL to where Autumn is publicly available
-AUTUMN_PUBLIC_URL=http://local.revolt.chat:3000
-
-# URL to where January is publicly available
-JANUARY_PUBLIC_URL=http://local.revolt.chat:7000
-
-# URL to where Vortex is publicly available
-# VOSO_PUBLIC_URL=https://voso.revolt.chat
-
-
-##
-## hCaptcha Settings
-##
-
-# If you are sure that you don't want to use hCaptcha, set to 1.
-REVOLT_UNSAFE_NO_CAPTCHA=1
-
-# hCaptcha API key
-# REVOLT_HCAPTCHA_KEY=0x0000000000000000000000000000000000000000
-
-# hCaptcha site key
-# REVOLT_HCAPTCHA_SITEKEY=10000000-ffff-ffff-ffff-000000000001
-
-
-##
-## Email Settings
-##
-
-# If you are sure that you don't want to use email verification, set to 1.
-REVOLT_UNSAFE_NO_EMAIL=1
-
-# SMTP host
-# REVOLT_SMTP_HOST=smtp.example.com
-
-# SMTP username
-# REVOLT_SMTP_USERNAME=noreply@example.com
-
-# SMTP password
-# REVOLT_SMTP_PASSWORD=CHANGEME
-
-# SMTP From header
-# REVOLT_SMTP_FROM=Revolt <noreply@example.com>
-
-
-##
-## Application Settings
-##
-
-# Whether to only allow users to sign up if they have an invite code
-REVOLT_INVITE_ONLY=0
-
-# Maximum number of people that can be in a group chat
-REVOLT_MAX_GROUP_SIZE=150
-
-# VAPID keys for push notifications
-# Generate using this guide: https://gitlab.insrt.uk/revolt/delta/-/wikis/vapid
-# --> Please replace these keys before going into production! <--
-REVOLT_VAPID_PRIVATE_KEY=LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUJSUWpyTWxLRnBiVWhsUHpUbERvcEliYk1yeVNrNXpKYzVYVzIxSjJDS3hvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFWnkrQkg2TGJQZ2hEa3pEempXOG0rUXVPM3pCajRXT1phdkR6ZU00c0pqbmFwd1psTFE0WAp1ZDh2TzVodU94QWhMQlU3WWRldVovWHlBdFpWZmNyQi9BPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
-REVOLT_VAPID_PUBLIC_KEY=BGcvgR-i2z4IQ5Mw841vJvkLjt8wY-FjmWrw83jOLCY52qcGZS0OF7nfLzuYbjsQISwVO2HXrmf18gLWVX3Kwfw=
-
-
-##
-## Vortex configuration
-##
-
-# VOSO_MANAGE_TOKEN=CHANGEME

.gitignore

@@ -1,3 +1,6 @@
 Rocket.toml
 target
 .data
+.env
+
+.vercel

Cargo.lock

@@ -2505,7 +2505,7 @@ dependencies = [
 [[package]]
 name = "rauth"
 version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=9c3f9bb58a549a51546bd748274130ac4a667cb4#9c3f9bb58a549a51546bd748274130ac4a667cb4"
+source = "git+https://github.com/insertish/rauth?rev=43a4081dd5943db39d27229d4792b0afe82c1674#43a4081dd5943db39d27229d4792b0afe82c1674"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2988,8 +2988,9 @@ dependencies = [
 [[package]]
 name = "rocket_rauth"
 version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=9c3f9bb58a549a51546bd748274130ac4a667cb4#9c3f9bb58a549a51546bd748274130ac4a667cb4"
+source = "git+https://github.com/insertish/rauth?rev=43a4081dd5943db39d27229d4792b0afe82c1674#43a4081dd5943db39d27229d4792b0afe82c1674"
 dependencies = [
+ "iso8601-timestamp",
  "okapi",
  "rauth",
  "rocket",

crates/delta/Cargo.toml

@@ -52,7 +52,7 @@ mobc-redis = { version = "0.7.0", default-features = false, features = ["async-s
 # web
 rocket = { version = "0.5.0-rc.2", default-features = false, features = ["json"] }
 rocket_empty = { git = "https://github.com/insertish/rocket_empty", branch = "master" }
-rocket_rauth = { git = "https://github.com/insertish/rauth", rev = "9c3f9bb58a549a51546bd748274130ac4a667cb4" }
+rocket_rauth = { git = "https://github.com/insertish/rauth", rev = "43a4081dd5943db39d27229d4792b0afe82c1674" }
 
 # spec generation
 schemars = "0.8.8"

crates/delta/src/routes/channels/channel_delete.rs

@@ -2,13 +2,27 @@ use revolt_quark::{
     models::{channel::PartialChannel, Channel, User},
     perms, Db, EmptyResponse, Error, Permission, Ref, Result,
 };
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+/// # Query Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsChannelDelete {
+    /// Whether to not send a leave message
+    leave_silently: Option<bool>,
+}
 
 /// # Close Channel
 ///
 /// Deletes a server channel, leaves a group or closes a group.
 #[openapi(tag = "Channel Information")]
-#[delete("/<target>")]
+#[delete("/<target>?<options..>")]
-pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: OptionsChannelDelete,
+) -> Result<EmptyResponse> {
     let mut channel = target.as_channel(db).await?;
     let mut perms = perms(&user).channel(&channel);
     perms.throw_permission(db, Permission::ViewChannel).await?;
@@ -27,7 +41,12 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
             .await
             .map(|_| EmptyResponse),
         Channel::Group { .. } => channel
-            .remove_user_from_group(db, &user.id, None)
+            .remove_user_from_group(
+                db,
+                &user.id,
+                None,
+                options.leave_silently.unwrap_or_default(),
+            )
             .await
             .map(|_| EmptyResponse),
         Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {

crates/delta/src/routes/channels/channel_edit.rs

@@ -29,6 +29,8 @@ pub struct DataEditChannel {
     icon: Option<String>,
     /// Whether this channel is age-restricted
     nsfw: Option<bool>,
+    /// Whether this channel is archived
+    archived: Option<bool>,
     #[validate(length(min = 1))]
     remove: Option<Vec<FieldsChannel>>,
 }
@@ -83,6 +85,7 @@ pub async fn req(
             }
 
             // Transfer ownership
+            partial.owner = Some(new_owner.to_string());
             let old_owner = std::mem::replace(owner, new_owner.to_string());
 
             // Notify clients

crates/delta/src/routes/channels/group_remove_member.rs

@@ -33,7 +33,7 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
             }
 
             channel
-                .remove_user_from_group(db, &member.id, Some(&user.id))
+                .remove_user_from_group(db, &member.id, Some(&user.id), false)
                 .await
                 .map(|_| EmptyResponse)
         }

crates/delta/src/routes/customisation/emoji_create.rs

@@ -55,7 +55,7 @@ pub async fn create_emoji(
             // Check that there are no more than 100 emoji
             // ! FIXME: hardcoded upper limit
             let emojis = db.fetch_emoji_by_parent_id(&server.id).await?;
-            if emojis.len() > 100 {
+            if emojis.len() > 99 {
                 return Err(Error::TooManyEmoji);
             }
         }

crates/delta/src/routes/servers/member_remove.rs

@@ -34,7 +34,7 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
     }
 
     server
-        .remove_member(db, member, RemovalIntention::Kick)
+        .remove_member(db, member, RemovalIntention::Kick, false)
         .await
         .map(|_| EmptyResponse)
 }

crates/delta/src/routes/servers/server_delete.rs

@@ -2,13 +2,27 @@ use revolt_quark::{
     models::{server_member::RemovalIntention, User},
     Db, EmptyResponse, Ref, Result,
 };
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+/// # Query Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsServerDelete {
+    /// Whether to not send a leave message
+    leave_silently: Option<bool>,
+}
 
 /// # Delete / Leave Server
 ///
 /// Deletes a server if owner otherwise leaves.
 #[openapi(tag = "Server Information")]
-#[delete("/<target>")]
+#[delete("/<target>?<options..>")]
-pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: OptionsServerDelete,
+) -> Result<EmptyResponse> {
     let server = target.as_server(db).await?;
     let member = db.fetch_member(&target.id, &user.id).await?;
 
@@ -16,7 +30,12 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
         server.delete(db).await
     } else {
         server
-            .remove_member(db, member, RemovalIntention::Leave)
+            .remove_member(
+                db,
+                member,
+                RemovalIntention::Leave,
+                options.leave_silently.unwrap_or_default(),
+            )
             .await
     }
     .map(|_| EmptyResponse)

crates/delta/src/routes/servers/server_edit.rs

@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use revolt_quark::{
     models::{
         server::{Category, FieldsServer, PartialServer, SystemMessageChannels},
@@ -135,29 +137,44 @@ pub async fn req(
         }
     }
 
-    // 2. Apply new icon
+    // 2. Validate changes
+    if let Some(system_messages) = &partial.system_messages {
+        for id in system_messages.clone().into_channel_ids() {
+            if !server.channels.contains(&id) {
+                return Err(Error::NotFound);
+            }
+        }
+    }
+
+    if let Some(categories) = &mut partial.categories {
+        let mut channel_ids = HashSet::new();
+        for category in categories {
+            for channel in &category.channels {
+                if channel_ids.contains(channel) {
+                    return Err(Error::InvalidOperation);
+                }
+
+                channel_ids.insert(channel.to_string());
+            }
+
+            category
+                .channels
+                .retain(|item| server.channels.contains(item));
+        }
+    }
+
+    // 3. Apply new icon
     if let Some(icon) = icon {
         partial.icon = Some(File::use_server_icon(db, &icon, &server.id).await?);
         server.icon = partial.icon.clone();
     }
 
-    // 3. Apply new banner
+    // 4. Apply new banner
     if let Some(banner) = banner {
         partial.banner = Some(File::use_banner(db, &banner, &server.id).await?);
         server.banner = partial.banner.clone();
     }
 
-    // 4. Validate changes
-    if let Some(system_messages) = &partial.system_messages {
-        let channels = system_messages.clone().into_channel_ids();
-        if !db
-            .check_channels_exist(&channels.into_iter().collect())
-            .await?
-        {
-            return Err(Error::NotFound);
-        }
-    }
-
     server
         .update(db, partial, remove.unwrap_or_default())
         .await?;

crates/quark/Cargo.toml

@@ -86,7 +86,7 @@ rocket_empty = { optional = true, git = "https://github.com/insertish/rocket_emp
 rocket_cors = { optional = true, git = "https://github.com/lawliet89/rocket_cors", rev = "5843861a88958c16bfaa0b40f0d8910772bcd2f6" }
 
 # rAuth
-rauth = { git = "https://github.com/insertish/rauth", rev = "9c3f9bb58a549a51546bd748274130ac4a667cb4", features = [ "async-std-runtime" ] }
+rauth = { git = "https://github.com/insertish/rauth", rev = "43a4081dd5943db39d27229d4792b0afe82c1674", features = [ "async-std-runtime" ] }
 
 # Sentry
 sentry = "0.25.0"

crates/quark/src/impl/dummy/channels/channel.rs

@@ -1,5 +1,3 @@
-use std::collections::HashSet;
-
 use crate::models::channel::{Channel, FieldsChannel, PartialChannel};
 use crate::{AbstractAttachment, AbstractChannel, Error, OverrideField, Result};
 
@@ -83,8 +81,4 @@ impl AbstractChannel for DummyDb {
         info!("Updating permissions for role {role} in {channel} with {permissions:?}");
         Ok(())
     }
-
-    async fn check_channels_exist(&self, _channels: &HashSet<String>) -> Result<bool> {
-        Ok(true)
-    }
 }

crates/quark/src/impl/generic/channels/channel.rs

@@ -286,6 +286,7 @@ impl Channel {
         db: &Database,
         user: &str,
         by: Option<&str>,
+        silent: bool,
     ) -> Result<()> {
         match &self {
             Channel::Group {
@@ -329,6 +330,7 @@ impl Channel {
                 .p(id.to_string())
                 .await;
 
+                if !silent {
                     if let Some(by) = by {
                         SystemMessage::UserRemove {
                             id: user.to_string(),
@@ -343,6 +345,7 @@ impl Channel {
                     .create(db, self, None)
                     .await
                     .ok();
+                }
 
                 Ok(())
             }

crates/quark/src/impl/generic/servers/server.rs

@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use iso8601_timestamp::Timestamp;
 use ulid::Ulid;
 
@@ -254,6 +256,7 @@ impl Server {
         db: &Database,
         member: Member,
         intention: RemovalIntention,
+        silent: bool,
     ) -> Result<()> {
         db.delete_member(&member.id).await?;
 
@@ -264,6 +267,7 @@ impl Server {
         .p(member.id.server)
         .await;
 
+        if !silent {
             if let Some(id) = self.system_messages.as_ref().and_then(|x| match intention {
                 RemovalIntention::Leave => x.user_left.as_ref(),
                 RemovalIntention::Kick => x.user_kicked.as_ref(),
@@ -279,6 +283,7 @@ impl Server {
                 .await
                 .ok();
             }
+        }
 
         Ok(())
     }
@@ -302,7 +307,7 @@ impl Server {
         member: Member,
         reason: Option<String>,
     ) -> Result<ServerBan> {
-        self.remove_member(db, member.clone(), RemovalIntention::Ban)
+        self.remove_member(db, member.clone(), RemovalIntention::Ban, false)
             .await?;
 
         self.ban_user(db, member.id, reason).await
@@ -310,23 +315,23 @@ impl Server {
 }
 
 impl SystemMessageChannels {
-    pub fn into_channel_ids(self) -> Vec<String> {
+    pub fn into_channel_ids(self) -> HashSet<String> {
-        let mut ids = vec![];
+        let mut ids = HashSet::new();
 
         if let Some(id) = self.user_joined {
-            ids.push(id);
+            ids.insert(id);
         }
 
         if let Some(id) = self.user_left {
-            ids.push(id);
+            ids.insert(id);
         }
 
         if let Some(id) = self.user_kicked {
-            ids.push(id);
+            ids.insert(id);
         }
 
         if let Some(id) = self.user_banned {
-            ids.push(id);
+            ids.insert(id);
         }
 
         ids

crates/quark/src/impl/mongo/channels/channel.rs

@@ -1,5 +1,3 @@
-use std::collections::HashSet;
-
 use bson::{Bson, Document};
 
 use crate::models::channel::{Channel, FieldsChannel, PartialChannel};
@@ -291,25 +289,6 @@ impl AbstractChannel for MongoDb {
                 with: "channel",
             })
     }
-
-    async fn check_channels_exist(&self, channels: &HashSet<String>) -> Result<bool> {
-        let count = channels.len() as u64;
-        self.col::<Document>(COL)
-            .count_documents(
-                doc! {
-                    "_id": {
-                        "$in": channels.iter().cloned().collect::<Vec<String>>()
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|x| x == count)
-            .map_err(|_| Error::DatabaseError {
-                operation: "count_documents",
-                with: "channel",
-            })
-    }
 }
 
 impl IntoDocumentPath for FieldsChannel {

crates/quark/src/models/channels/message.rs

@@ -86,10 +86,8 @@ pub struct Masquerade {
     /// Replace the display role colour shown on this message
     ///
     /// Must have `ManageRole` permission to use
-    ///
-    /// This can be any valid CSS colour
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[validate(length(min = 1, max = 32))]
+    #[validate(length(min = 1, max = 128), regex = "RE_COLOUR")]
     pub colour: Option<String>,
 }
 

crates/quark/src/models/users/user.rs

@@ -32,9 +32,15 @@ pub struct Relationship {
 /// Presence status
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
 pub enum Presence {
+    /// User is online
     Online,
+    /// User is not currently available
     Idle,
+    /// User is focusing / will only receive mentions
+    Focus,
+    /// User is busy / will not receive any notifications
     Busy,
+    /// User appears to be offline
     Invisible,
 }
 

crates/quark/src/traits/channels/channel.rs

@@ -1,5 +1,3 @@
-use std::collections::HashSet;
-
 use crate::models::channel::{Channel, FieldsChannel, PartialChannel};
 use crate::{OverrideField, Result};
 
@@ -55,7 +53,4 @@ pub trait AbstractChannel: Sync + Send {
         role: &str,
         permissions: OverrideField,
     ) -> Result<()>;
-
-    /// Validate existence of channels
-    async fn check_channels_exist(&self, channels: &HashSet<String>) -> Result<bool>;
 }