chore: clippy warnings

feat: update email templates to include recipient

.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

@@ -1454,12 +1454,12 @@ checksum = "90f97a5f38dd3ccfbe7aa80f4a0c00930f21b922c74195be0201c51028f22dcf"
 
 [[package]]
 name = "indexmap"
-version = "1.8.2"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg 1.1.0",
- "hashbrown 0.11.2",
+ "hashbrown 0.12.1",
  "serde",
 ]
 
@@ -1995,9 +1995,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
+checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
 
 [[package]]
 name = "opaque-debug"
@@ -2505,7 +2505,7 @@ dependencies = [
 [[package]]
 name = "rauth"
 version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=c2acaf6b31213e3969f8b48f9deed3daa125d394#c2acaf6b31213e3969f8b48f9deed3daa125d394"
+source = "git+https://github.com/insertish/rauth?rev=cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7#cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2714,7 +2714,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "1.0.6-patch.2"
+version = "0.5.5"
 dependencies = [
  "async-std",
  "async-tungstenite",
@@ -2730,7 +2730,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.5.3-7"
+version = "0.5.5"
 dependencies = [
  "async-channel",
  "async-std",
@@ -2783,6 +2783,7 @@ dependencies = [
  "dotenv",
  "futures",
  "impl_ops",
+ "indexmap",
  "iso8601-timestamp",
  "lazy_static",
  "linkify 0.8.1",
@@ -2792,6 +2793,7 @@ dependencies = [
  "nanoid",
  "num_enum",
  "okapi",
+ "once_cell",
  "optional_struct",
  "pretty_env_logger",
  "rauth",
@@ -2986,8 +2988,9 @@ dependencies = [
 [[package]]
 name = "rocket_rauth"
 version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=c2acaf6b31213e3969f8b48f9deed3daa125d394#c2acaf6b31213e3969f8b48f9deed3daa125d394"
+source = "git+https://github.com/insertish/rauth?rev=cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7#cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7"
 dependencies = [
+ "iso8601-timestamp",
  "okapi",
  "rauth",
  "rocket",

crates/bonfire/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "1.0.6-patch.2"
+version = "0.5.5"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 

crates/delta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.5.3-7"
+version = "0.5.5"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
@@ -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 = "c2acaf6b31213e3969f8b48f9deed3daa125d394" }
+rocket_rauth = { git = "https://github.com/insertish/rauth", rev = "cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7" }
 
 # 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>")]
-pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+#[delete("/<target>?<options..>")]
+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

@@ -16,20 +16,21 @@ use validator::Validate;
 pub struct DataEditChannel {
     /// Channel name
     #[validate(length(min = 1, max = 32))]
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
     /// Channel description
     #[validate(length(min = 0, max = 1024))]
-    #[serde(skip_serializing_if = "Option::is_none")]
     description: Option<String>,
+    /// Group owner
+    owner: Option<String>,
     /// Icon
     ///
     /// Provide an Autumn attachment Id.
     #[validate(length(min = 1, max = 128))]
     icon: Option<String>,
     /// Whether this channel is age-restricted
-    #[serde(skip_serializing_if = "Option::is_none")]
     nsfw: Option<bool>,
+    /// Whether this channel is archived
+    archived: Option<bool>,
     #[validate(length(min = 1))]
     remove: Option<Vec<FieldsChannel>>,
 }
@@ -59,12 +60,48 @@ pub async fn req(
         && data.description.is_none()
         && data.icon.is_none()
         && data.nsfw.is_none()
+        && data.owner.is_none()
         && data.remove.is_none()
     {
         return Ok(Json(channel));
     }
 
     let mut partial: PartialChannel = Default::default();
+
+    // Transfer group ownership
+    if let Some(new_owner) = data.owner {
+        if let Channel::Group {
+            owner, recipients, ..
+        } = &mut channel
+        {
+            // Make sure we are the owner of this group
+            if owner != &user.id {
+                return Err(Error::NotOwner);
+            }
+
+            // Ensure user is part of group
+            if !recipients.contains(&new_owner) {
+                return Err(Error::NotInGroup);
+            }
+
+            // Transfer ownership
+            partial.owner = Some(new_owner.to_string());
+            let old_owner = std::mem::replace(owner, new_owner.to_string());
+
+            // Notify clients
+            SystemMessage::ChannelOwnershipChanged {
+                from: old_owner,
+                to: new_owner,
+            }
+        } else {
+            return Err(Error::InvalidOperation);
+        }
+        .into_message(channel.id().to_string())
+        .create(db, &channel, None)
+        .await
+        .ok();
+    }
+
     match &mut channel {
         Channel::Group {
             id,

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/channels/message_clear_reactions.rs

@@ -0,0 +1,34 @@
+use revolt_quark::{
+    models::{message::PartialMessage, User},
+    perms, Db, EmptyResponse, Permission, Ref, Result,
+};
+
+/// # Remove All Reactions from Message
+///
+/// Remove your own, someone else's or all of a given reaction.
+///
+/// Requires `ManageMessages` permission.
+#[openapi(tag = "Interactions")]
+#[delete("/<target>/messages/<msg>/reactions")]
+pub async fn clear_reactions(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResponse> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::ManageMessages)
+        .await?;
+
+    // Fetch relevant message
+    let mut message = msg.as_message_in(db, channel.id()).await?;
+
+    // Clear reactions
+    message
+        .update(
+            db,
+            PartialMessage {
+                reactions: Some(Default::default()),
+                ..Default::default()
+            },
+        )
+        .await
+        .map(|_| EmptyResponse)
+}

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

@@ -0,0 +1,29 @@
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
+
+/// # Add Reaction to Message
+///
+/// React to a given message.
+#[openapi(tag = "Interactions")]
+#[put("/<target>/messages/<msg>/reactions/<emoji>")]
+pub async fn react_message(
+    db: &Db,
+    user: User,
+    target: Ref,
+    msg: Ref,
+    emoji: Ref,
+) -> Result<EmptyResponse> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::React)
+        .await?;
+
+    // Fetch relevant message
+    let message = msg.as_message_in(db, channel.id()).await?;
+
+    // Add the reaction
+    message
+        .add_reaction(db, &user, &emoji.id)
+        .await
+        .map(|_| EmptyResponse)
+}

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

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use revolt_quark::{
     models::{
-        message::{Masquerade, Reply, SendableEmbed},
+        message::{Interactions, Masquerade, Reply, SendableEmbed},
         Message, User,
     },
     perms,
@@ -40,6 +40,8 @@ pub struct DataMessageSend {
     /// Masquerade to apply to this message
     #[validate]
     masquerade: Option<Masquerade>,
+    /// Information about how this message should be interacted with
+    interactions: Option<Interactions>,
 }
 
 lazy_static! {
@@ -86,6 +88,7 @@ pub async fn message_send(
         channel: channel.id().to_string(),
         author: user.id.clone(),
         masquerade: data.masquerade,
+        interactions: data.interactions.unwrap_or_default(),
         ..Default::default()
     };
 
@@ -100,13 +103,22 @@ pub async fn message_send(
     }
 
     // 2. Verify permissions for masquerade.
-    if message.masquerade.is_some() {
+    if let Some(masq) = &message.masquerade {
         permissions
             .throw_permission(db, Permission::Masquerade)
             .await?;
+
+        if masq.colour.is_some() {
+            permissions
+                .throw_permission(db, Permission::ManageRole)
+                .await?;
+        }
     }
 
-    // 3. Verify replies are valid.
+    // 3. Ensure interactions information is correct
+    message.interactions.validate(db, &mut permissions).await?;
+
+    // 4. Verify replies are valid.
     let mut replies = HashSet::new();
     if let Some(entries) = data.replies {
         if entries.len() > 5 {
@@ -139,7 +151,7 @@ pub async fn message_send(
             .replace(replies.into_iter().collect::<Vec<String>>());
     }
 
-    // 4. Process included embeds.
+    // 5. Process included embeds.
     let mut embeds = vec![];
     if let Some(sendable_embeds) = data.embeds {
         for sendable_embed in sendable_embeds {
@@ -151,7 +163,7 @@ pub async fn message_send(
         message.embeds.replace(embeds);
     }
 
-    // 5. Add attachments to message.
+    // 6. Add attachments to message.
     let mut attachments = vec![];
     if let Some(ids) = &data.attachments {
         if !ids.is_empty() {
@@ -177,10 +189,10 @@ pub async fn message_send(
         message.attachments.replace(attachments);
     }
 
-    // 6. Set content
+    // 7. Set content
     message.content = data.content;
 
-    // 7. Pass-through nonce value for clients
+    // 8. Pass-through nonce value for clients
     message.nonce = Some(idempotency.into_key());
 
     message.create(db, &channel, Some(&user)).await?;

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

@@ -0,0 +1,58 @@
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
+use serde::{Deserialize, Serialize};
+
+/// # Query Parameters
+#[derive(Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsUnreact {
+    /// Remove a specific user's reaction
+    user_id: Option<String>,
+    /// Remove all reactions
+    remove_all: Option<bool>,
+}
+
+/// # Remove Reaction(s) to Message
+///
+/// Remove your own, someone else's or all of a given reaction.
+///
+/// Requires `ManageMessages` if changing others' reactions.
+#[openapi(tag = "Interactions")]
+#[delete("/<target>/messages/<msg>/reactions/<emoji>?<options..>")]
+pub async fn unreact_message(
+    db: &Db,
+    user: User,
+    target: Ref,
+    msg: Ref,
+    emoji: Ref,
+    options: OptionsUnreact,
+) -> Result<EmptyResponse> {
+    let channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
+    permissions
+        .throw_permission_and_view_channel(db, Permission::React)
+        .await?;
+
+    // Check if we need to escalate permissions
+    let remove_all = options.remove_all.unwrap_or_default();
+    if options.user_id.is_some() || remove_all {
+        permissions
+            .throw_permission(db, Permission::ManageMessages)
+            .await?;
+    }
+
+    // Fetch relevant message
+    let message = msg.as_message_in(db, channel.id()).await?;
+
+    // Check if we should wipe all of this reaction
+    if remove_all {
+        return message
+            .clear_reaction(db, &emoji.id)
+            .await
+            .map(|_| EmptyResponse);
+    }
+
+    // Remove the reaction
+    message
+        .remove_reaction(db, options.user_id.as_ref().unwrap_or(&user.id), &emoji.id)
+        .await
+        .map(|_| EmptyResponse)
+}

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

@@ -11,13 +11,16 @@ mod group_remove_member;
 mod invite_create;
 mod members_fetch;
 mod message_bulk_delete;
+mod message_clear_reactions;
 mod message_delete;
 mod message_edit;
 mod message_fetch;
 mod message_query;
 mod message_query_stale;
+mod message_react;
 mod message_search;
 mod message_send;
+mod message_unreact;
 mod permissions_set;
 mod permissions_set_default;
 mod voice_join;
@@ -44,5 +47,8 @@ pub fn routes() -> (Vec<Route>, OpenApi) {
         voice_join::req,
         permissions_set::req,
         permissions_set_default::req,
+        message_react::react_message,
+        message_unreact::unreact_message,
+        message_clear_reactions::clear_reactions
     ]
 }

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

@@ -0,0 +1,81 @@
+use revolt_quark::models::emoji::EmojiParent;
+use revolt_quark::models::{Emoji, File, User};
+use revolt_quark::{perms, Db, Error, Permission, Result};
+use serde::Deserialize;
+use validator::Validate;
+
+use crate::util::regex::RE_EMOJI;
+
+use rocket::serde::json::Json;
+
+/// # Emoji Data
+#[derive(Validate, Deserialize, JsonSchema)]
+pub struct DataCreateEmoji {
+    /// Server name
+    #[validate(length(min = 1, max = 32), regex = "RE_EMOJI")]
+    name: String,
+    /// Parent information
+    parent: EmojiParent,
+    /// Whether the emoji is mature
+    #[serde(default)]
+    nsfw: bool,
+}
+
+/// # Create New Emoji
+///
+/// Create an emoji by its Autumn upload id.
+#[openapi(tag = "Emojis")]
+#[put("/emoji/<id>", data = "<data>")]
+pub async fn create_emoji(
+    db: &Db,
+    user: User,
+    id: String,
+    data: Json<DataCreateEmoji>,
+) -> Result<Json<Emoji>> {
+    let data = data.into_inner();
+    data.validate()
+        .map_err(|error| Error::FailedValidation { error })?;
+
+    // Bots cannot manage emojis
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    // Validate we have permission to write into parent
+    match &data.parent {
+        EmojiParent::Server { id } => {
+            let server = db.fetch_server(id).await?;
+
+            // Check for permission
+            perms(&user)
+                .server(&server)
+                .throw_permission(db, Permission::ManageCustomisation)
+                .await?;
+
+            // 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() > 99 {
+                return Err(Error::TooManyEmoji);
+            }
+        }
+        EmojiParent::Detached => return Err(Error::InvalidOperation),
+    };
+
+    // Find the relevant attachment
+    let attachment = File::use_emoji(db, &id, &id).await?;
+
+    // Create the emoji object
+    let emoji = Emoji {
+        id,
+        parent: data.parent,
+        creator_id: user.id,
+        name: data.name,
+        animated: "image/gif" == &attachment.content_type,
+        nsfw: data.nsfw,
+    };
+
+    // Save emoji
+    emoji.create(db).await?;
+    Ok(Json(emoji))
+}

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

@@ -0,0 +1,37 @@
+use revolt_quark::models::{emoji::EmojiParent, User};
+use revolt_quark::{perms, Db, EmptyResponse, Error, Permission, Ref, Result};
+
+/// # Delete Emoji
+///
+/// Delete an emoji by its id.
+#[openapi(tag = "Emojis")]
+#[delete("/emoji/<id>")]
+pub async fn delete_emoji(db: &Db, user: User, id: Ref) -> Result<EmptyResponse> {
+    // Bots cannot manage emoji
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    // Fetch the emoji
+    let emoji = id.as_emoji(db).await?;
+
+    // If we uploaded the emoji, then we have permission to delete it
+    if emoji.creator_id != user.id {
+        // Otherwise, validate we have permission to delete from parent
+        match &emoji.parent {
+            EmojiParent::Server { id } => {
+                let server = db.fetch_server(id).await?;
+
+                // Check for permission
+                perms(&user)
+                    .server(&server)
+                    .throw_permission(db, Permission::ManageCustomisation)
+                    .await?;
+            }
+            EmojiParent::Detached => return Ok(EmptyResponse),
+        };
+    }
+
+    // Delete the emoji
+    emoji.delete(db).await.map(|_| EmptyResponse)
+}

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

@@ -0,0 +1,13 @@
+use revolt_quark::models::{Emoji, User};
+use revolt_quark::{Db, Ref, Result};
+
+use rocket::serde::json::Json;
+
+/// # Fetch Emoji
+///
+/// Fetch an emoji by its id.
+#[openapi(tag = "Emojis")]
+#[get("/emoji/<id>")]
+pub async fn fetch_emoji(db: &Db, _user: User, id: Ref) -> Result<Json<Emoji>> {
+    id.as_emoji(db).await.map(Json)
+}

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

@@ -0,0 +1,14 @@
+use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
+
+mod emoji_create;
+mod emoji_delete;
+mod emoji_fetch;
+
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
+        emoji_create::create_emoji,
+        emoji_delete::delete_emoji,
+        emoji_fetch::fetch_emoji
+    ]
+}

crates/delta/src/routes/mod.rs

@@ -5,6 +5,7 @@ use rocket_okapi::{okapi::openapi3::OpenApi, settings::OpenApiSettings};
 
 mod bots;
 mod channels;
+mod customisation;
 mod invites;
 mod onboard;
 mod push;
@@ -25,6 +26,7 @@ pub fn mount(mut rocket: Rocket<Build>) -> Rocket<Build> {
         "/channels" => channels::routes(),
         "/servers" => servers::routes(),
         "/invites" => invites::routes(),
+        "/custom" => customisation::routes(),
         "/auth/account" => rocket_rauth::routes::account::routes(),
         "/auth/session" => rocket_rauth::routes::session::routes(),
         "/auth/mfa" => rocket_rauth::routes::mfa::routes(),
@@ -78,6 +80,7 @@ fn custom_openapi_spec() -> OpenApi {
               "Channel Invites",
               "Channel Permissions",
               "Messaging",
+              "Interactions",
               "Groups",
               "Voice"
             ]
@@ -96,6 +99,12 @@ fn custom_openapi_spec() -> OpenApi {
               "Invites"
             ]
           },
+          {
+            "name": "Customisation",
+            "tags": [
+              "Emojis"
+            ]
+          },
           {
             "name": "Authentication",
             "tags": [

crates/delta/src/routes/push/subscribe.rs

@@ -22,7 +22,7 @@ pub async fn req(
 ) -> Result<EmptyResponse> {
     session.subscription = Some(data.into_inner());
     session
-        .save(&rauth)
+        .save(rauth)
         .await
         .map(|_| EmptyResponse)
         .map_err(|_| Error::DatabaseError {

crates/delta/src/routes/push/unsubscribe.rs

@@ -13,7 +13,7 @@ use rocket::State;
 pub async fn req(rauth: &State<RAuth>, mut session: Session) -> Result<EmptyResponse> {
     session.subscription = None;
     session
-        .save(&rauth)
+        .save(rauth)
         .await
         .map(|_| EmptyResponse)
         .map_err(|_| Error::DatabaseError {

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

@@ -1,5 +1,5 @@
 use revolt_quark::{
-    models::{ServerBan, User},
+    models::{server_member::MemberCompositeKey, ServerBan, User},
     perms, Db, Error, Permission, Ref, Result,
 };
 
@@ -47,13 +47,27 @@ pub async fn req(
         .throw_permission(db, Permission::BanMembers)
         .await?;
 
-    let member = target.as_member(db, &server.id).await?;
+    // If member exists, check privileges against them
+    if let Ok(member) = target.as_member(db, &server.id).await {
+        if member.get_ranking(permissions.server.get().unwrap())
+            <= permissions.get_member_rank().unwrap_or(i64::MIN)
+        {
+            return Err(Error::NotElevated);
+        }
 
-    if member.get_ranking(permissions.server.get().unwrap())
-        <= permissions.get_member_rank().unwrap_or(i64::MIN)
-    {
-        return Err(Error::NotElevated);
+        server.ban_member(db, member, data.reason).await.map(Json)
+    } else {
+        let server_id = server.id.to_string();
+        server
+            .ban_user(
+                db,
+                MemberCompositeKey {
+                    server: server_id,
+                    user: target.id,
+                },
+                data.reason,
+            )
+            .await
+            .map(Json)
     }
-
-    server.ban_member(db, member, data.reason).await.map(Json)
 }

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

@@ -0,0 +1,17 @@
+use revolt_quark::models::{Emoji, User};
+use revolt_quark::{perms, Db, Ref, Result};
+
+use rocket::serde::json::Json;
+
+/// # Fetch Server Emoji
+///
+/// Fetch all emoji on a server.
+#[openapi(tag = "Server Customisation")]
+#[get("/<target>/emojis")]
+pub async fn list_emoji(db: &Db, user: User, target: Ref) -> Result<Json<Vec<Emoji>>> {
+    let server = target.as_server(db).await?;
+    perms(&user).server(&server).calc(db).await?;
+
+    // Fetch all emoji from server if we can view it
+    db.fetch_emoji_by_parent_id(&server.id).await.map(Json)
+}

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

@@ -5,7 +5,7 @@ use revolt_quark::{
         server_member::{FieldsMember, PartialMember},
         File, Member, User,
     },
-    perms, Db, Error, Permission, Ref, Result,
+    perms, Db, Error, Permission, Ref, Result, Timestamp,
 };
 
 use rocket::serde::json::Json;
@@ -22,6 +22,8 @@ pub struct DataMemberEdit {
     avatar: Option<String>,
     /// Array of role ids
     roles: Option<Vec<String>>,
+    /// Timestamp this member is timed out until
+    timeout: Option<Timestamp>,
     /// Fields to remove from channel object
     #[validate(length(min = 1))]
     remove: Option<Vec<FieldsMember>>,
@@ -89,6 +91,16 @@ pub async fn req(
         required.push(Permission::AssignRoles);
     }
 
+    if data.timeout.is_some()
+        || data
+            .remove
+            .as_ref()
+            .map(|x| x.contains(&FieldsMember::Timeout))
+            .unwrap_or_default()
+    {
+        required.push(Permission::TimeoutMembers);
+    }
+
     for permission in required {
         permissions.throw_permission(db, permission).await?;
     }
@@ -105,13 +117,7 @@ pub async fn req(
 
     // Check permissions against roles in diff
     if let Some(roles) = &data.roles {
-        let fallback = vec![];
-        let current_roles = member
-            .roles
-            .as_ref()
-            .unwrap_or(&fallback)
-            .iter()
-            .collect::<HashSet<&String>>();
+        let current_roles = member.roles.iter().collect::<HashSet<&String>>();
 
         let new_roles = roles.iter().collect::<HashSet<&String>>();
         let added_roles: Vec<&&String> = new_roles.difference(&current_roles).collect();
@@ -132,12 +138,14 @@ pub async fn req(
         nickname,
         avatar,
         roles,
+        timeout,
         remove,
     } = data;
 
     let mut partial = PartialMember {
         nickname,
         roles,
+        timeout,
         ..Default::default()
     };
 

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

@@ -1,8 +1,6 @@
 use revolt_quark::{
     models::{Member, User},
-    perms,
-    presence::presence_filter_online,
-    Db, Ref, Result,
+    perms, Db, Ref, Result,
 };
 
 use rocket::serde::json::Json;
@@ -47,16 +45,7 @@ pub async fn req(
         user_ids.push(member.id.user.clone());
     }
 
-    let online_ids = presence_filter_online(&user_ids).await;
-    let mut users = db
-        .fetch_users(&user_ids)
-        .await?
-        .into_iter()
-        .map(|mut user| {
-            user.online = Some(online_ids.contains(&user.id));
-            user.foreign()
-        })
-        .collect::<Vec<User>>();
+    let mut users = User::fetch_foreign_users(db, &user_ids).await?;
 
     // Ensure the lists match up exactly.
     members.sort_by(|a, b| a.id.user.cmp(&b.id.user));

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/mod.rs

@@ -1,30 +1,26 @@
 use rocket::Route;
 use rocket_okapi::okapi::openapi3::OpenApi;
 
-mod server_ack;
-mod server_create;
-mod server_delete;
-mod server_edit;
-mod server_fetch;
-
-mod channel_create;
-
-mod member_edit;
-mod member_fetch;
-mod member_fetch_all;
-mod member_remove;
-
 mod ban_create;
 mod ban_list;
 mod ban_remove;
-
+mod channel_create;
+mod emoji_list;
 mod invites_fetch;
-
+mod member_edit;
+mod member_fetch;
+mod member_fetch_all;
+mod member_remove;
 mod permissions_set;
 mod permissions_set_default;
 mod roles_create;
 mod roles_delete;
 mod roles_edit;
+mod server_ack;
+mod server_create;
+mod server_delete;
+mod server_edit;
+mod server_fetch;
 
 pub fn routes() -> (Vec<Route>, OpenApi) {
     openapi_get_routes_spec![
@@ -46,6 +42,7 @@ pub fn routes() -> (Vec<Route>, OpenApi) {
         roles_edit::req,
         roles_delete::req,
         permissions_set::req,
-        permissions_set_default::req
+        permissions_set_default::req,
+        emoji_list::list_emoji
     ]
 }

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

@@ -3,7 +3,9 @@ use revolt_quark::{
         server::{FieldsRole, PartialRole, Role},
         User,
     },
-    perms, Db, Error, Permission, Ref, Result,
+    perms,
+    util::regex::RE_COLOUR,
+    Db, Error, Permission, Ref, Result,
 };
 
 use rocket::serde::json::Json;
@@ -17,7 +19,7 @@ pub struct DataEditRole {
     #[validate(length(min = 1, max = 32))]
     name: Option<String>,
     /// Role colour
-    #[validate(length(min = 1, max = 32))]
+    #[validate(length(min = 1, max = 128), regex = "RE_COLOUR")]
     colour: Option<String>,
     /// Whether this role should be displayed separately
     hoist: Option<bool>,

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>")]
-pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+#[delete("/<target>?<options..>")]
+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},
@@ -33,6 +35,8 @@ pub struct DataEditServer {
 
     // Whether this server is age-restricted
     // nsfw: Option<bool>,
+    /// Whether this server is public and should show up on [Revolt Discover](https://rvlt.gg)
+    discoverable: Option<bool>,
     /// Whether analytics should be collected for this server
     ///
     /// Must be enabled in order to show up on [Revolt Discover](https://rvlt.gg).
@@ -102,6 +106,7 @@ pub async fn req(
         categories,
         system_messages,
         // nsfw,
+        discoverable,
         analytics,
         remove,
     } = data;
@@ -112,6 +117,7 @@ pub async fn req(
         categories,
         system_messages,
         // nsfw,
+        discoverable,
         analytics,
         ..Default::default()
     };
@@ -131,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/delta/src/routes/users/add_friend.rs

@@ -10,11 +10,7 @@ use rocket::State;
 #[openapi(tag = "Relationships")]
 #[put("/<target>/friend")]
 pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<User>> {
-    let mut target = if let Ok(user) = db.fetch_user_by_username(&target.id).await {
-        user
-    } else {
-        target.as_user(db).await?
-    };
+    let mut target = target.as_user(db).await?;
 
     if user.bot.is_some() || target.bot.is_some() {
         return Err(Error::IsBot);

crates/delta/src/util/regex.rs

@@ -7,3 +7,8 @@ use regex::Regex;
 /// Block lookalike characters
 pub static RE_USERNAME: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"^[^\u200BА-Яа-яΑ-Ωα-ω@#:\n\r\[\]]+$").unwrap());
+
+/// Regex for valid emoji names
+///
+/// Alphanumeric and underscores
+pub static RE_EMOJI: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[a-z0-9_]+$").unwrap());

crates/quark/Cargo.toml

@@ -64,10 +64,12 @@ regex = "1.5.5"
 nanoid = "0.4.0"
 linkify = "0.8.1"
 dotenv = "0.15.0"
+indexmap = "1.9.1"
 impl_ops = "0.1.1"
 num_enum = "0.5.6"
 reqwest = "0.11.10"
 bitfield = "0.13.2"
+once_cell = "1.13.0"
 lazy_static = "1.4.0"
 
 lru = { version = "0.7.6", optional = true }
@@ -84,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 = "c2acaf6b31213e3969f8b48f9deed3daa125d394", features = [ "async-std-runtime" ] }
+rauth = { git = "https://github.com/insertish/rauth", rev = "cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7", features = [ "async-std-runtime" ] }
 
 # Sentry
 sentry = "0.25.0"

crates/quark/assets/templates/deletion.html

@@ -0,0 +1,138 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.3.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style type="text/css">
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
+    </style>
+  </head>
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+      <tbody>
+        <tr>
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
+              <tbody>
+                <tr>
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
+                      <tbody>
+                        <tr>
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Account Deletion</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">You requested to have your account deleted, if you did not perform this action please take measures to secure your account immediately.</p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
+                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Confirm</a>
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
+                              Made in the EU
+                            </div>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>

crates/quark/assets/templates/deletion.original.html

@@ -0,0 +1,30 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Add custom classes and styles that you want inlined here */
+    </style>
+  </head>
+  <body class="bg-light">
+    <div class="container">
+      <img
+        alt="Revolt Logo"
+        class="ax-center my-10 w-24"
+        src="https://app.revolt.chat/assets/logo_round.png"
+      />
+      <div class="card p-6 p-lg-10 space-y-4">
+        <h1 class="h3 fw-700">Account Deletion</h1>
+        <p>
+          You requested to have your account deleted, if you did not perform
+          this action please take measures to secure your account immediately.
+        </p>
+        <a class="btn btn-primary p-3 fw-700" href="{{url}}">Confirm</a>
+      </div>
+      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
+        Sent from Revolt<br />
+        Made in the EU
+      </div>
+    </div>
+  </body>
+</html>

crates/quark/assets/templates/deletion.txt

@@ -1,5 +1,7 @@
 You requested to have your account deleted, if you did not perform this action please take measures to secure your account immediately.
 
-Confirm here: {{url}}
+Please navigate to: {{url}}
 
-Sent by Revolt.
+This email is intended for {{email}}
+Sent by Revolt
+Made in the EU

crates/quark/assets/templates/reset.html

@@ -1,63 +1,138 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Reset your password.</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-	
-	<style type="text/css">
-		a[x-apple-data-detectors] {color: inherit !important;}
-	</style>
-	
-</head>
-<body style="margin: 0; padding: 0;">
-	<table border="0" cellpadding="0" cellspacing="0" width="100%">
-		<tr>
-			<td style="padding: 20px 0 30px 0;">
-				
-				<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
-					<tr>
-						<td align="center" bgcolor="#ff4654">
-							<img src="https://revolt.chat/header.png" alt="Revolt logo" width="600" height="168" style="display: block;" />
-						</td>
-					</tr>
-					<tr>
-						<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
-							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-								<tr>
-									<td style="color: #153643; font-family: Arial, sans-serif;">
-										<h1 style="font-size: 24px; margin: 0;">Reset your password!</h1>
-									</td>
-								</tr>
-								<tr>
-									<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
-										<p>
-											You requested a password reset, if you didn't perform this action you can safely ignore this email.
-										</p>
-										<p style="margin: 0;">
-											Reset your password by navigating to <a href="{{url}}">{{url}}</a>.
-										</p>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td bgcolor="#ff4654" style="padding: 30px 30px;">
-							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-								<tr>
-									<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
-										<p style="margin: 0;">Sent by Revolt. &middot; Website: <a style="color: white;" href="https://revolt.chat">https://revolt.chat</a></p>
-										<p>Revolt is a user-first chat platform built with modern web technologies.</p>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				
-			</td>
-		</tr>
-	</table>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.3.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style type="text/css">
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
+    </style>
+  </head>
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+      <tbody>
+        <tr>
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
+              <tbody>
+                <tr>
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
+                      <tbody>
+                        <tr>
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Password Reset</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">You requested a password reset, click below to continue.</p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
+                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Reset</a>
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
+                              Made in the EU
+                            </div>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>

crates/quark/assets/templates/reset.original.html

@@ -0,0 +1,26 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Add custom classes and styles that you want inlined here */
+    </style>
+  </head>
+  <body class="bg-light">
+    <div class="container">
+      <img
+        class="ax-center my-10 w-24"
+        src="https://app.revolt.chat/assets/logo_round.png"
+      />
+      <div class="card p-6 p-lg-10 space-y-4">
+        <h1 class="h3 fw-700">Password Reset</h1>
+        <p>You requested a password reset, click below to continue.</p>
+        <a class="btn btn-primary p-3 fw-700" href="{{url}}">Reset</a>
+      </div>
+      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
+        Sent from Revolt<br />
+        Made in the EU
+      </div>
+    </div>
+  </body>
+</html>

crates/quark/assets/templates/reset.txt

@@ -1,5 +1,7 @@
 You requested a password reset, if you did not perform this action you can safely ignore this email.
 
-Reset your password here: {{url}}
+Please navigate to: {{url}}
 
-Sent by Revolt.
+This email is intended for {{email}}
+Sent by Revolt
+Made in the EU

crates/quark/assets/templates/reset_plain.html

@@ -1,14 +0,0 @@
-<h2>Reset your password.</h2>
-<p>
-    You requested a password reset, if you did not perform this action you can safely ignore this email.
-</p>
-<p>
-    Reset your password here: <a href="{{url}}">{{url}}</a>
-</p>
-<br/>
-<p>
-   Sent by Revolt. · Website: <a href="https://revolt.chat">https://revolt.chat</a>
-</p>
-<p>
-    Revolt is a user-first chat platform built with modern web technologies.
-</p>

crates/quark/assets/templates/verify.html

@@ -1,63 +1,138 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Verify your account.</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-	
-	<style type="text/css">
-		a[x-apple-data-detectors] {color: inherit !important;}
-	</style>
-	
-</head>
-<body style="margin: 0; padding: 0;">
-	<table border="0" cellpadding="0" cellspacing="0" width="100%">
-		<tr>
-			<td style="padding: 20px 0 30px 0;">
-				
-				<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
-					<tr>
-						<td align="center" bgcolor="#ff4654">
-							<img src="https://revolt.chat/header.png" alt="Revolt logo" width="600" height="168" style="display: block;" />
-						</td>
-					</tr>
-					<tr>
-						<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
-							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-								<tr>
-									<td style="color: #153643; font-family: Arial, sans-serif;">
-										<h1 style="font-size: 24px; margin: 0;">You're almost there!</h1>
-									</td>
-								</tr>
-								<tr>
-									<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
-										<p>
-											Verify your account to be able to log into the platform. If you didn't perform this action you can safely ignore this email.
-										</p>
-										<p style="margin: 0;">
-											Please verify your account by navigating to <a href="{{url}}">{{url}}</a>.
-										</p>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td bgcolor="#ff4654" style="padding: 30px 30px;">
-							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-								<tr>
-									<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
-										<p style="margin: 0;">Sent by Revolt. &middot; Website: <a style="color: white;" href="https://revolt.chat">https://revolt.chat</a></p>
-										<p>Revolt is a user-first chat platform built with modern web technologies.</p>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				
-			</td>
-		</tr>
-	</table>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.3.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style type="text/css">
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
+    </style>
+  </head>
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+      <tbody>
+        <tr>
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
+              <tbody>
+                <tr>
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
+                      <tbody>
+                        <tr>
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Almost there!</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">To complete your sign up, we just need to verify your email.</p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
+                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Confirm</a>
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
+                              Made in the EU
+                            </div>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>

crates/quark/assets/templates/verify.original.html

@@ -0,0 +1,27 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Add custom classes and styles that you want inlined here */
+    </style>
+  </head>
+  <body class="bg-light">
+    <div class="container">
+      <img
+        alt="Revolt Logo"
+        class="ax-center my-10 w-24"
+        src="https://app.revolt.chat/assets/logo_round.png"
+      />
+      <div class="card p-6 p-lg-10 space-y-4">
+        <h1 class="h3 fw-700">Almost there!</h1>
+        <p>To complete your sign up, we just need to verify your email.</p>
+        <a class="btn btn-primary p-3 fw-700" href="{{url}}">Confirm</a>
+      </div>
+      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
+        Sent from Revolt<br />
+        Made in the EU
+      </div>
+    </div>
+  </body>
+</html>

crates/quark/assets/templates/verify.txt

@@ -1,6 +1,8 @@
-You're almost there!
-If you did not perform this action you can safely ignore this email.
+Almost there!
+To complete your sign up, we just need to verify your email.
 
-Please verify your account here: {{url}}
+Please navigate to: {{url}}
 
-Sent by Revolt.
+This email is intended for {{email}}
+Sent by Revolt
+Made in the EU

crates/quark/assets/templates/verify_plain.html

@@ -1,15 +0,0 @@
-<h2>You're almost there!</h2>
-<p>
-    Verify your account to be able to log into the platform.<br/>
-    If you did not perform this action you can safely ignore this email.
-</p>
-<p>
-    Please verify your account here: <a href="{{url}}">{{url}}</a>
-</p>
-<br/>
-<p>
-   Sent by Revolt. · Website: <a href="https://revolt.chat">https://revolt.chat</a>
-</p>
-<p>
-    Revolt is a user-first chat platform built with modern web technologies.
-</p>

crates/quark/src/events/client.rs

@@ -5,7 +5,7 @@ use crate::models::message::{AppendMessage, PartialMessage};
 use crate::models::server::{FieldsRole, FieldsServer, PartialRole, PartialServer};
 use crate::models::server_member::{FieldsMember, MemberCompositeKey, PartialMember};
 use crate::models::user::{FieldsUser, PartialUser, RelationshipStatus};
-use crate::models::{Channel, Member, Message, Server, User, UserSettings};
+use crate::models::{Channel, Emoji, Member, Message, Server, User, UserSettings};
 use crate::Error;
 
 /// WebSocket Client Errors
@@ -52,6 +52,7 @@ pub enum EventV1 {
         servers: Vec<Server>,
         channels: Vec<Channel>,
         members: Vec<Member>,
+        emojis: Option<Vec<Emoji>>,
     },
 
     /// Ping response
@@ -77,6 +78,29 @@ pub enum EventV1 {
     /// Delete message
     MessageDelete { id: String, channel: String },
 
+    /// New reaction to a message
+    MessageReact {
+        id: String,
+        channel_id: String,
+        user_id: String,
+        emoji_id: String,
+    },
+
+    /// Remove user's reaction from message
+    MessageUnreact {
+        id: String,
+        channel_id: String,
+        user_id: String,
+        emoji_id: String,
+    },
+
+    /// Remove a reaction from message
+    MessageRemoveReaction {
+        id: String,
+        channel_id: String,
+        emoji_id: String,
+    },
+
     /// Bulk delete messages
     BulkMessageDelete { channel: String, ids: Vec<String> },
 
@@ -170,4 +194,10 @@ pub enum EventV1 {
 
     /// Settings updated remotely
     UserSettingsUpdate { id: String, update: UserSettings },
+
+    /// New emoji
+    EmojiCreate(Emoji),
+
+    /// Delete emoji
+    EmojiDelete { id: String },
 }

crates/quark/src/events/impl.rs

@@ -111,6 +111,7 @@ impl State {
 
         // Fetch all memberships with their corresponding servers.
         let members: Vec<Member> = db.fetch_all_memberships(&user.id).await?;
+
         let server_ids: Vec<String> = members.iter().map(|x| x.id.server.clone()).collect();
         let servers = db.fetch_servers(&server_ids).await?;
 
@@ -151,6 +152,17 @@ impl State {
             )
             .await?;
 
+        // Fetch customisations.
+        let emojis = Some(
+            db.fetch_emoji_by_parent_ids(
+                &servers
+                    .iter()
+                    .map(|x| x.id.to_string())
+                    .collect::<Vec<String>>(),
+            )
+            .await?,
+        );
+
         // Copy data into local state cache.
         self.cache.users = users.iter().cloned().map(|x| (x.id.clone(), x)).collect();
         self.cache
@@ -202,6 +214,7 @@ impl State {
             servers,
             channels,
             members,
+            emojis,
         })
     }
 
@@ -472,10 +485,8 @@ impl State {
 
                 if data.rank.is_some() || data.permissions.is_some() {
                     if let Some(member) = self.cache.members.get(id) {
-                        if let Some(roles) = &member.roles {
-                            if roles.contains(role_id) {
-                                queue_server = Some(id.clone());
-                            }
+                        if member.roles.contains(role_id) {
+                            queue_server = Some(id.clone());
                         }
                     }
                 }
@@ -486,10 +497,8 @@ impl State {
                 }
 
                 if let Some(member) = self.cache.members.get(id) {
-                    if let Some(roles) = &member.roles {
-                        if roles.contains(role_id) {
-                            queue_server = Some(id.clone());
-                        }
+                    if member.roles.contains(role_id) {
+                        queue_server = Some(id.clone());
                     }
                 }
             }

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/dummy/channels/message.rs

@@ -64,4 +64,22 @@ impl AbstractMessage for DummyDb {
     ) -> Result<Vec<Message>> {
         Ok(vec![self.fetch_message(channel).await.unwrap()])
     }
+
+    /// Add a new reaction to a message
+    async fn add_reaction(&self, id: &str, emoji: &str, user: &str) -> Result<()> {
+        info!("Add to {id} with {emoji} and {user}");
+        Ok(())
+    }
+
+    /// Remove a reaction from a message
+    async fn remove_reaction(&self, id: &str, emoji: &str, user: &str) -> Result<()> {
+        info!("Remove {emoji} from {id} for {user}");
+        Ok(())
+    }
+
+    /// Remove reaction from a message
+    async fn clear_reaction(&self, id: &str, emoji: &str) -> Result<()> {
+        info!("Clear {emoji} on {id}");
+        Ok(())
+    }
 }

crates/quark/src/impl/dummy/media/emoji.rs

@@ -0,0 +1,42 @@
+use crate::models::emoji::EmojiParent;
+use crate::models::Emoji;
+use crate::{AbstractEmoji, Result};
+
+use super::super::DummyDb;
+
+#[async_trait]
+impl AbstractEmoji for DummyDb {
+    /// Fetch an emoji by its id
+    async fn fetch_emoji(&self, id: &str) -> Result<Emoji> {
+        Ok(Emoji {
+            id: id.into(),
+            name: id.into(),
+            parent: EmojiParent::Server { id: id.into() },
+            creator_id: id.into(),
+            animated: false,
+            nsfw: false,
+        })
+    }
+
+    /// Fetch emoji by their ids
+    async fn fetch_emoji_by_parent_id(&self, parent_id: &str) -> Result<Vec<Emoji>> {
+        Ok(vec![self.fetch_emoji(parent_id).await?])
+    }
+
+    /// Fetch emoji by their parent ids
+    async fn fetch_emoji_by_parent_ids(&self, _parent_ids: &[String]) -> Result<Vec<Emoji>> {
+        Ok(vec![])
+    }
+
+    /// Insert emoji into database.
+    async fn insert_emoji(&self, emoji: &Emoji) -> Result<()> {
+        info!("Insert {emoji:?}");
+        Ok(())
+    }
+
+    /// Detach an emoji by its id
+    async fn detach_emoji(&self, emoji: &Emoji) -> Result<()> {
+        info!("Detach {emoji:?}");
+        Ok(())
+    }
+}

crates/quark/src/impl/dummy/mod.rs

@@ -4,8 +4,9 @@ pub mod admin {
     pub mod migrations;
 }
 
-pub mod autumn {
+pub mod media {
     pub mod attachment;
+    pub mod emoji;
 }
 
 pub mod channels {

crates/quark/src/impl/dummy/servers/server_member.rs

@@ -3,6 +3,8 @@ use crate::{AbstractServerMember, Result};
 
 use super::super::DummyDb;
 
+use iso8601_timestamp::Timestamp;
+
 #[async_trait]
 impl AbstractServerMember for DummyDb {
     async fn fetch_member(&self, server: &str, user: &str) -> Result<Member> {
@@ -11,9 +13,11 @@ impl AbstractServerMember for DummyDb {
                 server: server.into(),
                 user: user.into(),
             },
+            joined_at: Timestamp::now_utc(),
             nickname: None,
             avatar: None,
-            roles: None,
+            roles: vec![],
+            timeout: None,
         })
     }
 

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 {
@@ -305,6 +306,15 @@ impl Channel {
                             vec![],
                         )
                         .await?;
+
+                        SystemMessage::ChannelOwnershipChanged {
+                            from: owner.to_string(),
+                            to: new_owner.into(),
+                        }
+                        .into_message(id.to_string())
+                        .create(db, self, None)
+                        .await
+                        .ok();
                     } else {
                         db.delete_channel(self).await?;
                         return Ok(());
@@ -320,20 +330,22 @@ impl Channel {
                 .p(id.to_string())
                 .await;
 
-                if let Some(by) = by {
-                    SystemMessage::UserRemove {
-                        id: user.to_string(),
-                        by: by.to_string(),
-                    }
-                } else {
-                    SystemMessage::UserLeft {
-                        id: user.to_string(),
+                if !silent {
+                    if let Some(by) = by {
+                        SystemMessage::UserRemove {
+                            id: user.to_string(),
+                            by: by.to_string(),
+                        }
+                    } else {
+                        SystemMessage::UserLeft {
+                            id: user.to_string(),
+                        }
                     }
+                    .into_message(id.to_string())
+                    .create(db, self, None)
+                    .await
+                    .ok();
                 }
-                .into_message(id.to_string())
-                .create(db, self, None)
-                .await
-                .ok();
 
                 Ok(())
             }

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

@@ -8,17 +8,19 @@ use crate::{
     events::client::EventV1,
     models::{
         message::{
-            AppendMessage, BulkMessageResponse, PartialMessage, SendableEmbed, SystemMessage,
+            AppendMessage, BulkMessageResponse, Interactions, PartialMessage, SendableEmbed,
+            SystemMessage,
         },
-        Channel, Message, User,
+        Channel, Emoji, Message, User,
     },
+    permissions::PermissionCalculator,
     presence::presence_filter_online,
     tasks::ack::AckEvent,
     types::{
         january::{Embed, Text},
         push::PushNotification,
     },
-    Database, Error, Result,
+    Database, Error, Permission, Result,
 };
 
 impl Message {
@@ -191,6 +193,84 @@ impl Message {
             Err(Error::PayloadTooLarge)
         }
     }
+
+    /// Add a reaction to a message
+    pub async fn add_reaction(&self, db: &Database, user: &User, emoji: &str) -> Result<()> {
+        // Check how many reactions are already on the message
+        if self.reactions.len() >= 20 {
+            return Err(Error::InvalidOperation);
+        }
+
+        // Check if the emoji is whitelisted
+        if !self.interactions.can_use(emoji) {
+            return Err(Error::InvalidOperation);
+        }
+
+        // Check if the emoji is usable by us
+        if !Emoji::can_use(db, emoji).await? {
+            return Err(Error::InvalidOperation);
+        }
+
+        // Send reaction event
+        EventV1::MessageReact {
+            id: self.id.to_string(),
+            channel_id: self.channel.to_string(),
+            user_id: user.id.to_string(),
+            emoji_id: emoji.to_string(),
+        }
+        .p(self.channel.to_string())
+        .await;
+
+        // Add emoji
+        db.add_reaction(&self.id, emoji, &user.id).await
+    }
+
+    /// Remove a reaction from a message
+    pub async fn remove_reaction(&self, db: &Database, user: &str, emoji: &str) -> Result<()> {
+        // Check if it actually exists
+        let empty = if let Some(users) = self.reactions.get(emoji) {
+            if !users.contains(user) {
+                return Err(Error::NotFound);
+            }
+
+            users.len() == 1
+        } else {
+            return Err(Error::NotFound);
+        };
+
+        // Send reaction event
+        EventV1::MessageUnreact {
+            id: self.id.to_string(),
+            channel_id: self.channel.to_string(),
+            user_id: user.to_string(),
+            emoji_id: emoji.to_string(),
+        }
+        .p(self.channel.to_string())
+        .await;
+
+        if empty {
+            // If empty, remove the reaction entirely
+            db.clear_reaction(&self.id, emoji).await
+        } else {
+            // Otherwise only remove that one reaction
+            db.remove_reaction(&self.id, emoji, user).await
+        }
+    }
+
+    /// Remove a reaction from a message
+    pub async fn clear_reaction(&self, db: &Database, emoji: &str) -> Result<()> {
+        // Send reaction event
+        EventV1::MessageRemoveReaction {
+            id: self.id.to_string(),
+            channel_id: self.channel.to_string(),
+            emoji_id: emoji.to_string(),
+        }
+        .p(self.channel.to_string())
+        .await;
+
+        // Write to database
+        db.clear_reaction(&self.id, emoji).await
+    }
 }
 
 pub trait IntoUsers {
@@ -262,6 +342,9 @@ impl From<SystemMessage> for String {
                 "Channel description changed.".to_string()
             }
             SystemMessage::ChannelIconChanged { .. } => "Channel icon changed.".to_string(),
+            SystemMessage::ChannelOwnershipChanged { .. } => {
+                "Channel ownership changed.".to_string()
+            }
         }
     }
 }
@@ -300,7 +383,7 @@ impl BulkMessageResponse {
     ) -> Result<BulkMessageResponse> {
         if let Some(true) = include_users {
             let user_ids = messages.get_user_ids();
-            let users = db.fetch_users(&user_ids).await?;
+            let users = User::fetch_foreign_users(db, &user_ids).await?;
 
             Ok(match channel {
                 Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
@@ -321,3 +404,46 @@ impl BulkMessageResponse {
         }
     }
 }
+
+impl Interactions {
+    /// Validate interactions info is correct
+    pub async fn validate(
+        &self,
+        db: &Database,
+        permissions: &mut PermissionCalculator<'_>,
+    ) -> Result<()> {
+        if let Some(reactions) = &self.reactions {
+            permissions.throw_permission(db, Permission::React).await?;
+
+            if reactions.len() > 20 {
+                return Err(Error::InvalidOperation);
+            }
+
+            for reaction in reactions {
+                if !Emoji::can_use(db, reaction).await? {
+                    return Err(Error::InvalidOperation);
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Check if we can use a given emoji to react
+    pub fn can_use(&self, emoji: &str) -> bool {
+        if self.restrict_reactions {
+            if let Some(reactions) = &self.reactions {
+                reactions.contains(emoji)
+            } else {
+                false
+            }
+        } else {
+            true
+        }
+    }
+
+    /// Check if default initialisation of fields
+    pub fn is_default(&self) -> bool {
+        !self.restrict_reactions && self.reactions.is_none()
+    }
+}

crates/quark/src/impl/generic/media/attachment.rs

@@ -30,4 +30,9 @@ impl File {
         db.find_and_use_attachment(id, "banners", "server", parent)
             .await
     }
+
+    pub async fn use_emoji(db: &Database, id: &str, parent: &str) -> Result<File> {
+        db.find_and_use_attachment(id, "emojis", "object", parent)
+            .await
+    }
 }

crates/quark/src/impl/generic/media/emoji.rs

@@ -0,0 +1,58 @@
+use std::{collections::HashSet, str::FromStr};
+
+use ulid::Ulid;
+
+use crate::{
+    events::client::EventV1,
+    models::{emoji::EmojiParent, Emoji},
+    Database, Result,
+};
+
+lazy_static! {
+    /// Permissible emojis
+    static ref PERMISSIBLE_EMOJIS: HashSet<String> = include_str!(crate::asset!("emojis.txt"))
+        .split('\n')
+        .map(|x| x.into())
+        .collect();
+}
+
+impl Emoji {
+    /// Get parent id
+    fn parent(&self) -> &str {
+        match &self.parent {
+            EmojiParent::Server { id } => id,
+            EmojiParent::Detached => "",
+        }
+    }
+
+    /// Create an emoji
+    pub async fn create(&self, db: &Database) -> Result<()> {
+        db.insert_emoji(self).await?;
+        EventV1::EmojiCreate(self.clone())
+            .p(self.parent().to_string())
+            .await;
+
+        Ok(())
+    }
+
+    /// Delete an emoji
+    pub async fn delete(self, db: &Database) -> Result<()> {
+        EventV1::EmojiDelete {
+            id: self.id.to_string(),
+        }
+        .p(self.parent().to_string())
+        .await;
+
+        db.detach_emoji(&self).await
+    }
+
+    /// Check whether we can use a given emoji
+    pub async fn can_use(db: &Database, emoji: &str) -> Result<bool> {
+        if Ulid::from_str(emoji).is_ok() {
+            db.fetch_emoji(emoji).await?;
+            Ok(true)
+        } else {
+            Ok(PERMISSIBLE_EMOJIS.contains(emoji))
+        }
+    }
+}

crates/quark/src/impl/generic/mod.rs

@@ -4,8 +4,9 @@ pub mod admin {
     pub mod migrations;
 }
 
-pub mod autumn {
+pub mod media {
     pub mod attachment;
+    pub mod emoji;
 }
 
 pub mod channels {

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

@@ -1,3 +1,6 @@
+use std::collections::HashSet;
+
+use iso8601_timestamp::Timestamp;
 use ulid::Ulid;
 
 use crate::{
@@ -188,7 +191,11 @@ impl Server {
                 server: self.id.clone(),
                 user: user.id.clone(),
             },
-            ..Default::default()
+            joined_at: Timestamp::now_utc(),
+            nickname: None,
+            avatar: None,
+            roles: vec![],
+            timeout: None,
         };
 
         db.insert_member(&member).await?;
@@ -249,6 +256,7 @@ impl Server {
         db: &Database,
         member: Member,
         intention: RemovalIntention,
+        silent: bool,
     ) -> Result<()> {
         db.delete_member(&member.id).await?;
 
@@ -259,25 +267,39 @@ impl Server {
         .p(member.id.server)
         .await;
 
-        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(),
-            RemovalIntention::Ban => x.user_banned.as_ref(),
-        }) {
-            match intention {
-                RemovalIntention::Leave => SystemMessage::UserLeft { id: member.id.user },
-                RemovalIntention::Kick => SystemMessage::UserKicked { id: member.id.user },
-                RemovalIntention::Ban => SystemMessage::UserBanned { id: member.id.user },
+        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(),
+                RemovalIntention::Ban => x.user_banned.as_ref(),
+            }) {
+                match intention {
+                    RemovalIntention::Leave => SystemMessage::UserLeft { id: member.id.user },
+                    RemovalIntention::Kick => SystemMessage::UserKicked { id: member.id.user },
+                    RemovalIntention::Ban => SystemMessage::UserBanned { id: member.id.user },
+                }
+                .into_message(id.to_string())
+                .create_no_web_push(db, id, false)
+                .await
+                .ok();
             }
-            .into_message(id.to_string())
-            .create_no_web_push(db, id, false)
-            .await
-            .ok();
         }
 
         Ok(())
     }
 
+    /// Create ban
+    pub async fn ban_user(
+        self,
+        db: &Database,
+        id: MemberCompositeKey,
+        reason: Option<String>,
+    ) -> Result<ServerBan> {
+        let ban = ServerBan { id, reason };
+        db.insert_ban(&ban).await?;
+        Ok(ban)
+    }
+
     /// Ban a member from a server
     pub async fn ban_member(
         self,
@@ -285,37 +307,31 @@ impl Server {
         member: Member,
         reason: Option<String>,
     ) -> Result<ServerBan> {
-        let ban = ServerBan {
-            id: member.id.clone(),
-            reason,
-        };
-
-        self.remove_member(db, member, RemovalIntention::Ban)
+        self.remove_member(db, member.clone(), RemovalIntention::Ban, false)
             .await?;
 
-        db.insert_ban(&ban).await?;
-        Ok(ban)
+        self.ban_user(db, member.id, reason).await
     }
 }
 
 impl SystemMessageChannels {
-    pub fn into_channel_ids(self) -> Vec<String> {
-        let mut ids = vec![];
+    pub fn into_channel_ids(self) -> HashSet<String> {
+        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/generic/servers/server_member.rs

@@ -1,3 +1,5 @@
+use iso8601_timestamp::Timestamp;
+
 use crate::{
     events::client::EventV1,
     models::{
@@ -36,19 +38,24 @@ impl Member {
 
     /// Get this user's current ranking
     pub fn get_ranking(&self, server: &Server) -> i64 {
-        if let Some(roles) = &self.roles {
-            let mut value = i64::MAX;
-            for role in roles {
-                if let Some(role) = server.roles.get(role) {
-                    if role.rank < value {
-                        value = role.rank;
-                    }
+        let mut value = i64::MAX;
+        for role in &self.roles {
+            if let Some(role) = server.roles.get(role) {
+                if role.rank < value {
+                    value = role.rank;
                 }
             }
+        }
 
-            value
+        value
+    }
+
+    /// Check whether this member is in timeout
+    pub fn in_timeout(&self) -> bool {
+        if let Some(timeout) = self.timeout {
+            *timeout > *Timestamp::now_utc()
         } else {
-            i64::MAX
+            false
         }
     }
 
@@ -56,7 +63,8 @@ impl Member {
         match field {
             FieldsMember::Avatar => self.avatar = None,
             FieldsMember::Nickname => self.nickname = None,
-            FieldsMember::Roles => self.roles = None,
+            FieldsMember::Roles => self.roles.clear(),
+            FieldsMember::Timeout => self.timeout = None,
         }
     }
 }

crates/quark/src/impl/generic/users/user.rs

@@ -4,6 +4,7 @@ use crate::models::user::{
 };
 use crate::permissions::defn::UserPerms;
 use crate::permissions::r#impl::user::get_relationship;
+use crate::presence::presence_filter_online;
 use crate::{perms, Database, Error, Result};
 
 use futures::try_join;
@@ -67,6 +68,7 @@ impl User {
     }
 
     /// Mutate the user object to remove redundant information
+    #[must_use]
     pub fn foreign(mut self) -> User {
         self.profile = None;
         self.relations = None;
@@ -94,6 +96,21 @@ impl User {
         self
     }
 
+    /// Fetch foreign users by a list of IDs
+    pub async fn fetch_foreign_users(db: &Database, user_ids: &[String]) -> Result<Vec<User>> {
+        let online_ids = presence_filter_online(user_ids).await;
+
+        Ok(db
+            .fetch_users(user_ids)
+            .await?
+            .into_iter()
+            .map(|mut user| {
+                user.online = Some(online_ids.contains(&user.id));
+                user.foreign()
+            })
+            .collect::<Vec<User>>())
+    }
+
     /// Mutate the user object to include relationship (if it does not already exist)
     #[must_use]
     pub fn with_relationship(self, perspective: &User) -> User {

crates/quark/src/impl/mongo/admin/migrations/scripts.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use bson::Bson;
+use bson::{Bson, DateTime};
 use futures::StreamExt;
 use mongodb::{
     bson::{doc, from_bson, from_document, to_document, Document},
@@ -16,7 +16,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 16;
+pub const LATEST_REVISION: i32 = 18;
 
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
@@ -611,6 +611,56 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .unwrap();
     }
 
+    if revision <= 16 {
+        info!("Running migration [revision 16 / 07-07-2022]: Add `emojis` collection and rAuth migration.");
+
+        let rauth_db = rauth::Database::MongoDb(rauth::database::MongoDb(db.db()));
+        rauth_db
+            .run_migration(rauth::Migration::M2022_06_09AddIndexForDeletion)
+            .await
+            .unwrap();
+
+        db.db()
+            .create_collection("emojis", None)
+            .await
+            .expect("Failed to create emojis collection.");
+
+        db.db()
+            .run_command(
+                doc! {
+                    "createIndexes": "emojis",
+                    "indexes": [
+                        {
+                            "key": {
+                                "parent.id": 1_i32,
+                            },
+                            "name": "parent_id"
+                        }
+                    ]
+                },
+                None,
+            )
+            .await
+            .expect("Failed to create emoji parent index.");
+    }
+
+    if revision <= 17 {
+        info!("Running migration [revision 17 / 15-07-2022]: Initialise `joined_at` property on server members.");
+
+        db.col::<Document>("server_members")
+            .update_many(
+                doc! {},
+                doc! {
+                    "$set": {
+                        "joined_at": DateTime::now().to_rfc3339_string()
+                    }
+                },
+                None,
+            )
+            .await
+            .expect("Failed to update server members.");
+    }
+
     // Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.
 
     // Reminder to update LATEST_REVISION when adding new migrations.

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/impl/mongo/channels/message.rs

@@ -279,4 +279,70 @@ impl AbstractMessage for MongoDb {
         )
         .await
     }
+
+    /// Add a new reaction to a message
+    async fn add_reaction(&self, id: &str, emoji: &str, user: &str) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_one(
+                doc! {
+                    "_id": id
+                },
+                doc! {
+                    "$addToSet": {
+                        format!("reactions.{emoji}"): user
+                    }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| Error::DatabaseError {
+                operation: "update_one",
+                with: "message",
+            })
+    }
+
+    /// Remove a reaction from a message
+    async fn remove_reaction(&self, id: &str, emoji: &str, user: &str) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_one(
+                doc! {
+                    "_id": id
+                },
+                doc! {
+                    "$pull": {
+                        format!("reactions.{emoji}"): user
+                    }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| Error::DatabaseError {
+                operation: "update_one",
+                with: "message",
+            })
+    }
+
+    /// Remove reaction from a message
+    async fn clear_reaction(&self, id: &str, emoji: &str) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_one(
+                doc! {
+                    "_id": id
+                },
+                doc! {
+                    "$unset": {
+                        format!("reactions.{emoji}"): 1
+                    }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| Error::DatabaseError {
+                operation: "update_one",
+                with: "message",
+            })
+    }
 }

crates/quark/src/impl/mongo/media/emoji.rs

@@ -0,0 +1,69 @@
+use bson::Document;
+
+use crate::models::Emoji;
+use crate::{AbstractEmoji, Error, Result};
+
+use super::super::MongoDb;
+
+static COL: &str = "emojis";
+
+#[async_trait]
+impl AbstractEmoji for MongoDb {
+    /// Fetch an emoji by its id
+    async fn fetch_emoji(&self, id: &str) -> Result<Emoji> {
+        self.find_one_by_id(COL, id).await
+    }
+
+    /// Fetch emoji by their ids
+    async fn fetch_emoji_by_parent_id(&self, parent_id: &str) -> Result<Vec<Emoji>> {
+        self.find(
+            COL,
+            doc! {
+                "parent.id": parent_id
+            },
+        )
+        .await
+    }
+
+    /// Fetch emoji by their parent ids
+    async fn fetch_emoji_by_parent_ids(&self, parent_ids: &[String]) -> Result<Vec<Emoji>> {
+        self.find(
+            COL,
+            doc! {
+                "parent.id": {
+                    "$in": parent_ids
+                }
+            },
+        )
+        .await
+    }
+
+    /// Insert emoji into database.
+    async fn insert_emoji(&self, emoji: &Emoji) -> Result<()> {
+        self.insert_one(COL, emoji).await.map(|_| ())
+    }
+
+    /// Delete an emoji by its id
+    async fn detach_emoji(&self, emoji: &Emoji) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_one(
+                doc! {
+                    "_id": &emoji.id
+                },
+                doc! {
+                    "$set": {
+                        "parent": {
+                            "type": "Detached"
+                        }
+                    }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| Error::DatabaseError {
+                operation: "update_one",
+                with: "emojis",
+            })
+    }
+}

crates/quark/src/impl/mongo/mod.rs

@@ -15,8 +15,9 @@ pub mod admin {
     pub mod migrations;
 }
 
-pub mod autumn {
+pub mod media {
     pub mod attachment;
+    pub mod emoji;
 }
 
 pub mod channels {

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

@@ -18,6 +18,20 @@ impl MongoDb {
         })
         .await?;
 
+        // Delete all emoji.
+        self.col::<Document>("emojis")
+            .delete_many(
+                doc! {
+                    "parent.id": &server.id
+                },
+                None,
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "delete_many",
+                with: "emojis",
+            })?;
+
         // Delete all channels.
         self.col::<Document>("channels")
             .delete_many(

crates/quark/src/impl/mongo/servers/server_member.rs

@@ -129,6 +129,7 @@ impl IntoDocumentPath for FieldsMember {
             FieldsMember::Avatar => "avatar",
             FieldsMember::Nickname => "nickname",
             FieldsMember::Roles => "roles",
+            FieldsMember::Timeout => "timeout",
         })
     }
 }

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

@@ -161,7 +161,7 @@ pub struct PartialChannel {
 }
 
 /// Optional fields on channel object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsChannel {
     Description,
     Icon,

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

@@ -1,8 +1,10 @@
+use crate::util::regex::RE_COLOUR;
+
+use indexmap::{IndexMap, IndexSet};
+use iso8601_timestamp::Timestamp;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-use iso8601_timestamp::Timestamp;
-
 #[cfg(feature = "rocket_impl")]
 use rocket::FromFormField;
 
@@ -11,6 +13,11 @@ use crate::{
     types::january::Embed,
 };
 
+/// Utility function to check if a boolean value is false
+pub fn if_false(t: &bool) -> bool {
+    !t
+}
+
 /// # Reply
 ///
 /// Representation of a message reply before it is sent.
@@ -33,7 +40,7 @@ pub struct SendableEmbed {
     #[validate(length(min = 1, max = 2000))]
     pub description: Option<String>,
     pub media: Option<String>,
-    #[validate(length(min = 1, max = 64))]
+    #[validate(length(min = 1, max = 128), regex = "RE_COLOUR")]
     pub colour: Option<String>,
 }
 
@@ -61,6 +68,8 @@ pub enum SystemMessage {
     ChannelDescriptionChanged { by: String },
     #[serde(rename = "channel_icon_changed")]
     ChannelIconChanged { by: String },
+    #[serde(rename = "channel_ownership_changed")]
+    ChannelOwnershipChanged { from: String, to: String },
 }
 
 /// Name and / or avatar override information
@@ -74,6 +83,23 @@ pub struct Masquerade {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[validate(length(min = 1, max = 128))]
     pub avatar: Option<String>,
+    /// Replace the display role colour shown on this message
+    ///
+    /// Must have `ManageRole` permission to use
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[validate(length(min = 1, max = 128), regex = "RE_COLOUR")]
+    pub colour: Option<String>,
+}
+
+/// Information to guide interactions on this message
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, Validate, Default)]
+pub struct Interactions {
+    /// Reactions which should always appear and be distinct
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub reactions: Option<IndexSet<String>>,
+    /// Whether reactions should be restricted to the given list
+    #[serde(skip_serializing_if = "if_false", default)]
+    pub restrict_reactions: bool,
 }
 
 /// Representation of a Message on Revolt
@@ -115,6 +141,12 @@ pub struct Message {
     /// Array of message ids this message is replying to
     #[serde(skip_serializing_if = "Option::is_none")]
     pub replies: Option<Vec<String>>,
+    /// Hashmap of emoji IDs to array of user IDs
+    #[serde(skip_serializing_if = "IndexMap::is_empty", default)]
+    pub reactions: IndexMap<String, IndexSet<String>>,
+    /// Information about how this message should be interacted with
+    #[serde(skip_serializing_if = "Interactions::is_default", default)]
+    pub interactions: Interactions,
     /// Name and / or avatar overrides for this message
     #[serde(skip_serializing_if = "Option::is_none")]
     pub masquerade: Option<Masquerade>,

crates/quark/src/models/media/emoji.rs

@@ -0,0 +1,34 @@
+use serde::{Deserialize, Serialize};
+
+/// Utility function to check if a boolean value is false
+pub fn if_false(t: &bool) -> bool {
+    !t
+}
+
+/// Information about what owns this emoji
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
+#[serde(tag = "type")]
+pub enum EmojiParent {
+    Server { id: String },
+    Detached,
+}
+
+/// Representation of an Emoji on Revolt
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
+pub struct Emoji {
+    /// Unique Id
+    #[serde(rename = "_id")]
+    pub id: String,
+    /// What owns this emoji
+    pub parent: EmojiParent,
+    /// Uploader user id
+    pub creator_id: String,
+    /// Emoji name
+    pub name: String,
+    /// Whether the emoji is animated
+    #[serde(skip_serializing_if = "if_false", default)]
+    pub animated: bool,
+    /// Whether the emoji is marked as nsfw
+    #[serde(skip_serializing_if = "if_false", default)]
+    pub nsfw: bool,
+}

crates/quark/src/models/mod.rs

@@ -3,8 +3,9 @@ mod admin {
     pub mod simple;
 }
 
-mod autumn {
+mod media {
     pub mod attachment;
+    pub mod emoji;
 }
 
 mod channels {
@@ -27,8 +28,8 @@ mod users {
 }
 
 pub use admin::*;
-pub use autumn::*;
 pub use channels::*;
+pub use media::*;
 pub use servers::*;
 pub use users::*;
 
@@ -37,6 +38,7 @@ pub use bot::Bot;
 pub use channel::Channel;
 pub use channel_invite::Invite;
 pub use channel_unread::ChannelUnread;
+pub use emoji::Emoji;
 pub use message::Message;
 pub use migrations::MigrationInfo;
 pub use server::Server;

crates/quark/src/models/relations.drawio

@@ -0,0 +1,205 @@
+<mxfile host="65bd71144e">
+    <diagram id="9BKyaxnbqnTkbfLuLd1z" name="Page-1">
+        <mxGraphModel dx="1033" dy="710" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="56" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=0;strokeColor=#B3B3B3;dashed=1;" parent="1" source="2" target="6" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="57" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=0;strokeColor=#B3B3B3;dashed=1;" parent="1" source="2" target="5" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="260" y="370"/>
+                            <mxPoint x="275" y="370"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="58" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=0;strokeColor=#B3B3B3;dashed=1;" parent="1" source="2" target="9" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="260" y="370"/>
+                            <mxPoint x="342" y="370"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="59" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;strokeColor=#B3B3B3;dashed=1;" parent="1" source="2" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="300" y="250" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="260" y="370"/>
+                            <mxPoint x="300" y="370"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="2" value="Attachment" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="220" y="490" width="80" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="49" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="3" target="5" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="195" y="340"/>
+                            <mxPoint x="245" y="340"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="51" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;" parent="1" source="3" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="290" y="160" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="195" y="260"/>
+                            <mxPoint x="260" y="260"/>
+                            <mxPoint x="260" y="220"/>
+                            <mxPoint x="290" y="220"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="3" value="Channel Invite" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="150" y="400" width="90" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="4" value="Channel Unread" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="40" y="400" width="100" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="43" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;dashed=1;" parent="1" source="5" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="60" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;strokeColor=#FFFFFF;" parent="1" source="5" target="9" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="5" value="Channel" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="230" y="280" width="60" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="45" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="6" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="46" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="6" target="5" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="310" y="355"/>
+                            <mxPoint x="260" y="355"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="6" value="Message" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="280" y="400" width="60" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="54" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="7" target="9" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="505" y="350"/>
+                            <mxPoint x="355" y="350"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="7" value="Server Ban" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="470" y="400" width="70" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="47" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="8" target="9" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="405" y="350"/>
+                            <mxPoint x="355" y="350"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="48" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="8" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="405" y="350"/>
+                            <mxPoint x="310" y="350"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="8" value="Server Member" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="360" y="400" width="90" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="29" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=diamondThin;endFill=1;startArrow=diamondThin;startFill=1;" parent="1" source="10" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="240" y="145"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="10" value="Bot" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="200" y="130" width="40" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="31" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="11" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="11" value="User Settings" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="150" y="210" width="90" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="15" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;endArrow=diamondThin;endFill=1;" parent="1" source="12" target="13" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="12" value="User" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="280" y="130" width="40" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="13" value="Account" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="310" y="40" width="60" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="17" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;endArrow=diamondThin;endFill=1;" parent="1" source="14" target="13" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="14" value="Session" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="350" y="130" width="60" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="44" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;entryX=0.75;entryY=1;entryDx=0;entryDy=0;" parent="1" source="9" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="310" y="160" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="355" y="220"/>
+                            <mxPoint x="310" y="220"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="9" value="Server" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="330" y="280" width="50" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="55" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="4" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="290" y="160" as="targetPoint"/>
+                        <mxPoint x="200" y="400" as="sourcePoint"/>
+                        <Array as="points">
+                            <mxPoint x="90" y="370"/>
+                            <mxPoint x="195" y="370"/>
+                            <mxPoint x="195" y="260"/>
+                            <mxPoint x="260" y="260"/>
+                            <mxPoint x="260" y="220"/>
+                            <mxPoint x="290" y="220"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="63" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;startArrow=none;startFill=0;endArrow=diamondThin;endFill=0;strokeColor=#FFFFFF;entryX=1;entryY=1;entryDx=0;entryDy=0;" parent="1" source="61" target="12" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="584.25" y="335" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="584" y="340"/>
+                            <mxPoint x="390" y="340"/>
+                            <mxPoint x="390" y="210"/>
+                            <mxPoint x="320" y="210"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="64" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;strokeColor=#FFFFFF;" parent="1" source="61" target="9" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="584" y="340"/>
+                            <mxPoint x="368" y="340"/>
+                            <mxPoint x="368" y="310"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="61" value="Emoji" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="558.5" y="400" width="51.5" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="65" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=0;strokeColor=#B3B3B3;dashed=1;" parent="1" source="2" target="61" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="270" y="500" as="sourcePoint"/>
+                        <mxPoint x="320" y="440" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>

crates/quark/src/models/servers/server.rs

@@ -134,7 +134,7 @@ pub struct Server {
 }
 
 /// Optional fields on server object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsServer {
     Description,
     Categories,
@@ -144,7 +144,7 @@ pub enum FieldsServer {
 }
 
 /// Optional fields on server object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsRole {
     Colour,
 }

crates/quark/src/models/servers/server_member.rs

@@ -1,3 +1,4 @@
+use iso8601_timestamp::Timestamp;
 use serde::{Deserialize, Serialize};
 
 use crate::models::attachment::File;
@@ -12,7 +13,7 @@ pub struct MemberCompositeKey {
 }
 
 /// Representation of a member of a server on Revolt
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, OptionalStruct, Default)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, OptionalStruct)]
 #[optional_derive(Serialize, Deserialize, JsonSchema, Debug, Default, Clone)]
 #[optional_name = "PartialMember"]
 #[opt_skip_serializing_none]
@@ -22,6 +23,9 @@ pub struct Member {
     #[serde(rename = "_id")]
     pub id: MemberCompositeKey,
 
+    /// Time at which this user joined the server
+    pub joined_at: Timestamp,
+
     /// Member's nickname
     #[serde(skip_serializing_if = "Option::is_none")]
     pub nickname: Option<String>,
@@ -30,16 +34,20 @@ pub struct Member {
     pub avatar: Option<File>,
 
     /// Member's roles
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub roles: Vec<String>,
+    /// Timestamp this member is timed out until
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub roles: Option<Vec<String>>,
+    pub timeout: Option<Timestamp>,
 }
 
 /// Optional fields on server member object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsMember {
     Nickname,
     Avatar,
     Roles,
+    Timeout,
 }
 
 /// Member removal intention

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

@@ -56,7 +56,7 @@ pub struct Bot {
 }
 
 /// Optional fields on bot object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq)]
 pub enum FieldsBot {
     Token,
     InteractionsURL,

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

@@ -10,7 +10,7 @@ pub fn if_false(t: &bool) -> bool {
 }
 
 /// User's relationship with another user (or themselves)
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)]
 pub enum RelationshipStatus {
     None,
     User,
@@ -30,11 +30,17 @@ pub struct Relationship {
 }
 
 /// Presence status
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)]
 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,
 }
 
@@ -157,7 +163,7 @@ pub struct User {
 }
 
 /// Optional fields on user object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsUser {
     Avatar,
     StatusText,

crates/quark/src/permissions/defn/mod.rs

@@ -45,8 +45,23 @@ impl Override {
 impl PermissionValue {
     /// Apply a given override to this value
     pub fn apply(&mut self, v: Override) {
-        self.0 |= v.allow;
-        self.0 &= !v.deny;
+        self.allow(v.allow);
+        self.revoke(v.deny);
+    }
+
+    /// Allow given permissions
+    pub fn allow(&mut self, v: u64) {
+        self.0 |= v;
+    }
+
+    /// Revoke given permissions
+    pub fn revoke(&mut self, v: u64) {
+        self.0 &= !v;
+    }
+
+    /// Restrict to given permissions
+    pub fn restrict(&mut self, v: u64) {
+        self.0 &= v;
     }
 }
 

crates/quark/src/permissions/defn/permission.rs

@@ -21,8 +21,10 @@ pub enum Permission {
     ManagePermissions = 1 << 2,
     /// Manage roles on server
     ManageRole = 1 << 3,
+    /// Manage server customisation (includes emoji)
+    ManageCustomisation = 1 << 4,
 
-    // % 2 bits reserved
+    // % 1 bits reserved
 
     // * Member permissions
     /// Kick other members below their ranking
@@ -63,8 +65,8 @@ pub enum Permission {
     UploadFiles = 1 << 27,
     /// Masquerade messages using custom nickname and avatar
     Masquerade = 1 << 28,
-
-    // % 1 bits reserved
+    /// React to messages with emojis
+    React = 1 << 29,
 
     // * Voice permissions
     /// Connect to a voice channel
@@ -96,6 +98,7 @@ impl_op_ex!(+ |a: &Permission, b: &Permission| -> u64 { *a as u64 | *b as u64 })
 impl_op_ex_commutative!(+ |a: &u64, b: &Permission| -> u64 { *a | *b as u64 });
 
 lazy_static! {
+    pub static ref ALLOW_IN_TIMEOUT: u64 = Permission::ViewChannel + Permission::ReadMessageHistory;
     pub static ref DEFAULT_PERMISSION_VIEW_ONLY: u64 =
         Permission::ViewChannel + Permission::ReadMessageHistory;
     pub static ref DEFAULT_PERMISSION: u64 = *DEFAULT_PERMISSION_VIEW_ONLY
@@ -122,6 +125,7 @@ bitfield! {
     pub can_manage_server, _: 62;
     pub can_manage_permissions, _: 61;
     pub can_manage_roles, _: 60;
+    pub can_manage_customisation, _: 59;
 
     // * Member permissions
     pub can_kick_members, _: 57;

crates/quark/src/permissions/impl/permission.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use crate::{
     models::Channel, permissions::PermissionCalculator, Override, Permission, PermissionValue,
-    Permissions, Perms, Result, DEFAULT_PERMISSION_DIRECT_MESSAGE,
+    Permissions, Perms, Result, ALLOW_IN_TIMEOUT, DEFAULT_PERMISSION_DIRECT_MESSAGE,
     DEFAULT_PERMISSION_SAVED_MESSAGES, DEFAULT_PERMISSION_VIEW_ONLY,
 };
 
@@ -55,11 +55,7 @@ async fn calculate_server_permission(
     let mut permissions: PermissionValue = server.default_permissions.into();
 
     // 4. Resolve each role in order.
-    let member_roles: HashSet<&String> = if let Some(roles) = member.roles.as_ref() {
-        roles.iter().collect()
-    } else {
-        HashSet::new()
-    };
+    let member_roles: HashSet<&String> = member.roles.iter().collect();
 
     if !member_roles.is_empty() {
         let mut roles = server
@@ -80,6 +76,11 @@ async fn calculate_server_permission(
         }
     }
 
+    // 5. Revoke permissions if member is timed out.
+    if member.in_timeout() {
+        permissions.restrict(*ALLOW_IN_TIMEOUT);
+    }
+
     Ok(permissions)
 }
 
@@ -110,25 +111,36 @@ async fn calculate_channel_permission(
 
     // 1. Check channel type.
     let value: PermissionValue = match channel {
-        Channel::SavedMessages { .. } => (*DEFAULT_PERMISSION_SAVED_MESSAGES).into(),
-        Channel::DirectMessage { recipients, .. } => {
-            // 2. Fetch user.
-            let other_user = recipients
-                .iter()
-                .find(|x| x != &&data.perspective.id)
-                .unwrap();
-
-            let user = db.fetch_user(other_user).await?;
-            data.user.set(user);
-
-            // 3. Calculate user permissions.
-            let perms = data.calc_user(db).await;
-
-            // 4. Check if the user can send messages.
-            if perms.get_send_message() {
-                (*DEFAULT_PERMISSION_DIRECT_MESSAGE).into()
+        Channel::SavedMessages { user, .. } => {
+            if user == &data.perspective.id {
+                (*DEFAULT_PERMISSION_SAVED_MESSAGES).into()
             } else {
-                (*DEFAULT_PERMISSION_VIEW_ONLY).into()
+                0_u64.into()
+            }
+        }
+        Channel::DirectMessage { recipients, .. } => {
+            // 2. Ensure we are a recipient.
+            if recipients.contains(&data.perspective.id) {
+                // 3. Fetch user.
+                let other_user = recipients
+                    .iter()
+                    .find(|x| x != &&data.perspective.id)
+                    .unwrap();
+
+                let user = db.fetch_user(other_user).await?;
+                data.user.set(user);
+
+                // 4. Calculate user permissions.
+                let perms = data.calc_user(db).await;
+
+                // 5. Check if the user can send messages.
+                if perms.get_send_message() {
+                    (*DEFAULT_PERMISSION_DIRECT_MESSAGE).into()
+                } else {
+                    (*DEFAULT_PERMISSION_VIEW_ONLY).into()
+                }
+            } else {
+                0_u64.into()
             }
         }
         Channel::Group {
@@ -182,11 +194,7 @@ async fn calculate_channel_permission(
                 }
 
                 // 4. Resolve each role in order.
-                let member_roles: HashSet<&String> = if let Some(roles) = member.roles.as_ref() {
-                    roles.iter().collect()
-                } else {
-                    HashSet::new()
-                };
+                let member_roles: HashSet<&String> = member.roles.iter().collect();
 
                 if !member_roles.is_empty() {
                     let mut roles = role_permissions
@@ -208,6 +216,11 @@ async fn calculate_channel_permission(
                     }
                 }
 
+                // 5. Revoke permissions if member is timed out.
+                if member.in_timeout() {
+                    permissions.restrict(*ALLOW_IN_TIMEOUT);
+                }
+
                 permissions
             } else {
                 (Permission::GrantAllSafe as u64).into()

crates/quark/src/presence/mod.rs

@@ -147,7 +147,7 @@ pub async fn presence_clear_region(region_id: Option<&str>) {
         // also send out any relevant events.
         for session in sessions {
             let parts = session.split(':').collect::<Vec<&str>>();
-            if let (Some(user_id), Some(session_id)) = (parts.get(0), parts.get(1)) {
+            if let (Some(user_id), Some(session_id)) = (parts.first(), parts.get(1)) {
                 if let Ok(session_id) = session_id.parse() {
                     presence_delete_session_internal(user_id, session_id, true).await;
                 }

crates/quark/src/presence/operations.rs

@@ -53,5 +53,5 @@ pub async fn __get_set_sessions(conn: &mut Conn, region_id: &str) -> Vec<String>
 
 /// Delete region session set
 pub async fn __delete_set_sessions(conn: &mut Conn, region_id: &str) {
-    let _: () = conn.del(region_id).await.unwrap();
+    conn.del::<_, ()>(region_id).await.unwrap();
 }

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>;
 }

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

@@ -42,4 +42,13 @@ pub trait AbstractMessage: Sync + Send {
         after: Option<String>,
         sort: MessageSort,
     ) -> Result<Vec<Message>>;
+
+    /// Add a new reaction to a message
+    async fn add_reaction(&self, id: &str, emoji: &str, user: &str) -> Result<()>;
+
+    /// Remove a reaction from a message
+    async fn remove_reaction(&self, id: &str, emoji: &str, user: &str) -> Result<()>;
+
+    /// Remove reaction from a message
+    async fn clear_reaction(&self, id: &str, emoji: &str) -> Result<()>;
 }

crates/quark/src/traits/media/attachment.rs

@@ -3,6 +3,7 @@ use crate::Result;
 
 #[async_trait]
 pub trait AbstractAttachment: Sync + Send {
+    /// Find an attachment by its details and mark it as used by a given parent.
     async fn find_and_use_attachment(
         &self,
         id: &str,
@@ -10,8 +11,16 @@ pub trait AbstractAttachment: Sync + Send {
         parent_type: &str,
         parent_id: &str,
     ) -> Result<File>;
+
+    /// Insert attachment into database.
     async fn insert_attachment(&self, attachment: &File) -> Result<()>;
+
+    /// Mark an attachment as having been reported.
     async fn mark_attachment_as_reported(&self, id: &str) -> Result<()>;
+
+    /// Mark an attachment as having been deleted.
     async fn mark_attachment_as_deleted(&self, id: &str) -> Result<()>;
+
+    /// Mark multiple attachments as having been deleted.
     async fn mark_attachments_as_deleted(&self, ids: &[String]) -> Result<()>;
 }

crates/quark/src/traits/media/emoji.rs

@@ -0,0 +1,20 @@
+use crate::models::Emoji;
+use crate::Result;
+
+#[async_trait]
+pub trait AbstractEmoji: Sync + Send {
+    /// Fetch an emoji by its id
+    async fn fetch_emoji(&self, id: &str) -> Result<Emoji>;
+
+    /// Fetch emoji by their parent id
+    async fn fetch_emoji_by_parent_id(&self, parent_id: &str) -> Result<Vec<Emoji>>;
+
+    /// Fetch emoji by their parent ids
+    async fn fetch_emoji_by_parent_ids(&self, parent_ids: &[String]) -> Result<Vec<Emoji>>;
+
+    /// Insert emoji into database.
+    async fn insert_emoji(&self, emoji: &Emoji) -> Result<()>;
+
+    /// Detach an emoji by its id
+    async fn detach_emoji(&self, emoji: &Emoji) -> Result<()>;
+}

crates/quark/src/traits/mod.rs

@@ -2,8 +2,9 @@ mod admin {
     pub mod migrations;
 }
 
-mod autumn {
+mod media {
     pub mod attachment;
+    pub mod emoji;
 }
 
 mod channels {
@@ -27,7 +28,8 @@ mod users {
 
 pub use admin::migrations::AbstractMigrations;
 
-pub use autumn::attachment::AbstractAttachment;
+pub use media::attachment::AbstractAttachment;
+pub use media::emoji::AbstractEmoji;
 
 pub use channels::channel::AbstractChannel;
 pub use channels::channel_invite::AbstractChannelInvite;
@@ -42,14 +44,12 @@ pub use users::bot::AbstractBot;
 pub use users::user::AbstractUser;
 pub use users::user_settings::AbstractUserSettings;
 
-// pub trait AbstractEventEmitter {}
-// + AbstractEventEmitter
-
 pub trait AbstractDatabase:
     Sync
     + Send
     + AbstractMigrations
     + AbstractAttachment
+    + AbstractEmoji
     + AbstractChannel
     + AbstractChannelInvite
     + AbstractChannelUnread

crates/quark/src/util/mod.rs

@@ -3,6 +3,7 @@ pub mod manipulation;
 pub mod pfp;
 pub mod rauth;
 pub mod r#ref;
+pub mod regex;
 pub mod result;
 pub mod value;
 pub mod variables;

crates/quark/src/util/rauth.rs

@@ -26,19 +26,19 @@ pub fn config() -> Config {
                         title: "Verify your Revolt account.".into(),
                         text: include_str!(crate::asset!("templates/verify.txt")).into(),
                         url: format!("{}/login/verify/", *APP_URL),
-                        html: None,
+                        html: Some(include_str!(crate::asset!("templates/verify.html")).into()),
                     },
                     reset: Template {
                         title: "Reset your Revolt password.".into(),
                         text: include_str!(crate::asset!("templates/reset.txt")).into(),
                         url: format!("{}/login/reset/", *APP_URL),
-                        html: None,
+                        html: Some(include_str!(crate::asset!("templates/reset.html")).into()),
                     },
                     deletion: Template {
                         title: "Confirm account deletion.".into(),
                         text: include_str!(crate::asset!("templates/deletion.txt")).into(),
                         url: format!("{}/delete/", *APP_URL),
-                        html: None,
+                        html: Some(include_str!(crate::asset!("templates/deletion.html")).into()),
                     },
                     welcome: None,
                 },

crates/quark/src/util/ref.rs

@@ -4,9 +4,9 @@ use schemars::schema::{InstanceType, Schema, SchemaObject, SingleOrVec};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::models::{Bot, Channel, Invite, Member, Message, Server, ServerBan, User};
+use crate::models::{Bot, Channel, Emoji, Invite, Member, Message, Server, ServerBan, User};
 use crate::presence::presence_is_online;
-use crate::{Database, Result};
+use crate::{Database, Error, Result};
 
 /// Reference to some object in the database
 #[derive(Serialize, Deserialize)]
@@ -44,6 +44,16 @@ impl Ref {
         db.fetch_message(&self.id).await
     }
 
+    /// Fetch message in channel from Ref
+    pub async fn as_message_in(&self, db: &Database, channel: &str) -> Result<Message> {
+        let message = self.as_message(db).await?;
+        if message.channel != channel {
+            return Err(Error::NotFound);
+        }
+
+        Ok(message)
+    }
+
     /// Fetch bot from Ref
     pub async fn as_bot(&self, db: &Database) -> Result<Bot> {
         db.fetch_bot(&self.id).await
@@ -63,6 +73,11 @@ impl Ref {
     pub async fn as_ban(&self, db: &Database, server: &str) -> Result<ServerBan> {
         db.fetch_ban(server, &self.id).await
     }
+
+    /// Fetch emoji from Ref
+    pub async fn as_emoji(&self, db: &Database) -> Result<Emoji> {
+        db.fetch_emoji(&self.id).await
+    }
 }
 
 impl<'r> FromParam<'r> for Ref {

crates/quark/src/util/regex.rs

@@ -0,0 +1,21 @@
+use once_cell::sync::Lazy;
+use regex::Regex;
+
+/// Regex for valid role colours
+///
+/// Allows the use of named colours, rgb(a), variables and all gradients.
+///
+/// Flags:
+/// - Case-insensitive (`i`)
+///
+/// Source:
+/// ```regex
+/// VALUE = [a-z ]+|var\(--[a-z\d-]+\)|rgba?\([\d, ]+\)|#[a-f0-9]+
+/// ADDITIONAL_VALUE = \d+deg
+/// STOP = ([ ]+(\d{1,3}%|0))?
+///
+/// ^(?:VALUE|(repeating-)?(linear|conic|radial)-gradient\((VALUE|ADDITIONAL_VALUE)STOP(,[ ]*(VALUE)STOP)+\))$
+/// ```
+pub static RE_COLOUR: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r"(?i)^(?:[a-z ]+|var\(--[a-z\d-]+\)|rgba?\([\d, ]+\)|#[a-f0-9]+|(repeating-)?(linear|conic|radial)-gradient\(([a-z ]+|var\(--[a-z\d-]+\)|rgba?\([\d, ]+\)|#[a-f0-9]+|\d+deg)([ ]+(\d{1,3}%|0))?(,[ ]*([a-z ]+|var\(--[a-z\d-]+\)|rgba?\([\d, ]+\)|#[a-f0-9]+)([ ]+(\d{1,3}%|0))?)+\))$").unwrap()
+});

crates/quark/src/util/result.rs

@@ -56,6 +56,7 @@ pub enum Error {
     TooManyServers {
         max: usize,
     },
+    TooManyEmoji,
 
     // ? Bot related errors.
     ReachedMaximumBots,
@@ -71,6 +72,7 @@ pub enum Error {
     },
     NotElevated,
     CannotGiveMissingPermissions,
+    NotOwner,
 
     // ? General errors.
     DatabaseError {
@@ -156,6 +158,7 @@ impl<'r> Responder<'r, 'static> for Error {
             Error::InvalidRole => Status::NotFound,
             Error::Banned => Status::Forbidden,
             Error::TooManyServers { .. } => Status::Forbidden,
+            Error::TooManyEmoji => Status::BadRequest,
 
             Error::ReachedMaximumBots => Status::BadRequest,
             Error::IsBot => Status::BadRequest,
@@ -165,6 +168,7 @@ impl<'r> Responder<'r, 'static> for Error {
             Error::MissingUserPermission { .. } => Status::Forbidden,
             Error::NotElevated => Status::Forbidden,
             Error::CannotGiveMissingPermissions => Status::Forbidden,
+            Error::NotOwner => Status::Forbidden,
 
             Error::DatabaseError { .. } => Status::InternalServerError,
             Error::InternalError => Status::InternalServerError,

docker-compose.yml

@@ -50,11 +50,12 @@ services:
       /usr/bin/mc mb minio/backgrounds;
       /usr/bin/mc mb minio/icons;
       /usr/bin/mc mb minio/banners;
+      /usr/bin/mc mb minio/emojis;
       exit 0;
       "
   # File server (autumn)
   autumn:
-    image: ghcr.io/revoltchat/autumn:1.1.4
+    image: ghcr.io/revoltchat/autumn:1.1.5
     env_file: .env
     depends_on:
       - database