chore: bump version

Cargo.lock

@@ -3580,7 +3580,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "async-std",
  "async-tungstenite",
@@ -3600,7 +3600,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-config"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "async-std",
  "cached",
@@ -3612,7 +3612,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-database"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "async-lock",
  "async-recursion",
@@ -3657,7 +3657,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "async-channel",
  "async-std",
@@ -3703,7 +3703,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-models"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "indexmap",
  "iso8601-timestamp 0.2.11",
@@ -3719,7 +3719,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-permissions"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3734,7 +3734,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-presence"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "async-std",
  "log",
@@ -3745,7 +3745,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-quark"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "async-lock",
  "async-recursion",
@@ -3798,7 +3798,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-result"
-version = "0.6.11"
+version = "0.6.12"
 dependencies = [
  "revolt_okapi",
  "revolt_rocket_okapi",

crates/bonfire/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.6.11"
+version = "0.6.12"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 

crates/core/config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.6.11"
+version = "0.6.12"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/database/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.6.11"
+version = "0.6.12"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -23,11 +23,11 @@ default = ["mongodb", "async-std-runtime", "tasks"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.6.11", path = "../config" }
-revolt-result = { version = "0.6.11", path = "../result" }
-revolt-models = { version = "0.6.11", path = "../models" }
-revolt-presence = { version = "0.6.11", path = "../presence" }
-revolt-permissions = { version = "0.6.11", path = "../permissions", features = [
+revolt-config = { version = "0.6.12", path = "../config" }
+revolt-result = { version = "0.6.12", path = "../result" }
+revolt-models = { version = "0.6.12", path = "../models" }
+revolt-presence = { version = "0.6.12", path = "../presence" }
+revolt-permissions = { version = "0.6.12", path = "../permissions", features = [
     "serde",
     "bson",
 ] }

crates/core/database/src/util/bridge/v0.rs

@@ -341,11 +341,7 @@ impl From<crate::Message> for Message {
             embeds: value.embeds,
             mentions: value.mentions,
             replies: value.replies,
-            reactions: value
-                .reactions
-                .into_iter()
-                .map(|(k, v)| (k, v.into_iter().collect()))
-                .collect(),
+            reactions: value.reactions,
             interactions: value.interactions.into(),
             masquerade: value.masquerade.map(|masq| masq.into()),
         }
@@ -369,12 +365,7 @@ impl From<crate::PartialMessage> for PartialMessage {
             embeds: value.embeds,
             mentions: value.mentions,
             replies: value.replies,
-            reactions: value.reactions.map(|reactions| {
-                reactions
-                    .into_iter()
-                    .map(|(k, v)| (k, v.into_iter().collect()))
-                    .collect()
-            }),
+            reactions: value.reactions,
             interactions: value.interactions.map(|interactions| interactions.into()),
             masquerade: value.masquerade.map(|masq| masq.into()),
         }

crates/core/models/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.6.11"
+version = "0.6.12"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -18,8 +18,8 @@ default = ["serde", "partials"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.6.11", path = "../config" }
-revolt-permissions = { version = "0.6.11", path = "../permissions" }
+revolt-config = { version = "0.6.12", path = "../config" }
+revolt-permissions = { version = "0.6.12", path = "../permissions" }
 
 # Utility
 regex = "1"
@@ -32,7 +32,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 iso8601-timestamp = { version = "0.2.11", features = ["schema", "bson"] }
 
 # Spec Generation
-schemars = { version = "0.8.8", optional = true }
+schemars = { version = "0.8.8", optional = true, features = ["indexmap1"] }
 
 # Validation
 validator = { version = "0.16.0", optional = true, features = ["derive"] }

crates/core/models/src/v0/messages.rs

@@ -1,8 +1,6 @@
-use std::{
-    collections::{HashMap, HashSet},
-    time::SystemTime,
-};
+use std::time::SystemTime;
 
+use indexmap::{IndexMap, IndexSet};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use revolt_config::config;
@@ -55,8 +53,8 @@ auto_derived_partial!(
         #[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 = "HashMap::is_empty", default)]
-        pub reactions: HashMap<String, HashSet<String>>,
+        #[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,
@@ -119,7 +117,7 @@ auto_derived!(
     pub struct Interactions {
         /// Reactions which should always appear and be distinct
         #[serde(skip_serializing_if = "Option::is_none", default)]
-        pub reactions: Option<HashSet<String>>,
+        pub reactions: Option<IndexSet<String>>,
         /// Whether reactions should be restricted to the given list
         ///
         /// Can only be set to true if reactions list is of at least length 1

crates/core/permissions/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.6.11"
+version = "0.6.12"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/presence/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.6.11"
+version = "0.6.12"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/result/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.6.11"
+version = "0.6.12"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/delta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.6.11"
+version = "0.6.12"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"

crates/delta/src/util/ratelimiter.rs

@@ -180,7 +180,7 @@ impl Ratelimiter {
     pub fn from(
         identifier: &str,
         (bucket, resource): (&str, Option<&str>),
-    ) -> Result<Ratelimiter, u128> {
+    ) -> Result<Ratelimiter, Ratelimiter> {
         let mut key = DefaultHasher::new();
         key.write(identifier.as_bytes());
         key.write(bucket.as_bytes());
@@ -194,27 +194,29 @@ impl Ratelimiter {
         let mut entry = Entry::from(key);
 
         let remaining = entry.get_remaining(limit);
-        if remaining > 0 {
-            entry.deduct();
-
-            let reset = entry.left_until_reset();
-            entry.save(key);
-
-            Ok(Ratelimiter {
-                key,
-                limit,
-                remaining: remaining - 1,
-                reset,
-            })
-        } else {
-            Err(entry.left_until_reset())
+        let reset = entry.left_until_reset();
+        let mut ratelimiter = Ratelimiter {
+            key,
+            limit,
+            remaining,
+            reset,
+        };
+        if remaining == 0 {
+            return Err(ratelimiter);
         }
+
+        entry.deduct();
+        entry.save(key);
+        ratelimiter.remaining -= 1;
+        ratelimiter.reset = entry.left_until_reset();
+
+        Ok(ratelimiter)
     }
 }
 
 #[async_trait]
 impl<'r> FromRequest<'r> for Ratelimiter {
-    type Error = u128;
+    type Error = Ratelimiter;
 
     async fn from_request(request: &'r rocket::Request<'_>) -> Outcome<Self, Self::Error> {
         let ratelimiter = request
@@ -233,7 +235,7 @@ impl<'r> FromRequest<'r> for Ratelimiter {
 
         match ratelimiter {
             Ok(ratelimiter) => Outcome::Success(*ratelimiter),
-            Err(retry_after) => Outcome::Failure((Status::TooManyRequests, *retry_after)),
+            Err(ratelimiter) => Outcome::Failure((Status::TooManyRequests, *ratelimiter)),
         }
     }
 }
@@ -275,23 +277,24 @@ impl Fairing for RatelimitFairing {
     }
 
     async fn on_response<'r>(&self, request: &'r Request<'_>, response: &mut Response<'r>) {
-        use rocket::outcome::Outcome;
-        match request.guard::<Ratelimiter>().await {
-            Outcome::Success(ratelimiter) => {
-                let Ratelimiter {
-                    key,
-                    limit,
-                    remaining,
-                    reset,
-                } = ratelimiter;
+        let guard = request.guard::<Ratelimiter>().await;
+        let (Outcome::Success(ratelimiter) | Outcome::Failure((_, ratelimiter))) = guard else {
+            unreachable!()
+        };
+        let Ratelimiter {
+            key,
+            limit,
+            remaining,
+            reset,
+        } = ratelimiter;
 
-                response.set_raw_header("X-RateLimit-Limit", limit.to_string());
-                response.set_raw_header("X-RateLimit-Bucket", key.to_string());
-                response.set_raw_header("X-RateLimit-Remaining", remaining.to_string());
-                response.set_raw_header("X-RateLimit-Reset-After", reset.to_string());
-            }
-            Outcome::Failure(_) => response.set_status(Status::TooManyRequests),
-            Outcome::Forward(_) => unreachable!(),
+        response.set_raw_header("X-RateLimit-Limit", limit.to_string());
+        response.set_raw_header("X-RateLimit-Bucket", key.to_string());
+        response.set_raw_header("X-RateLimit-Remaining", remaining.to_string());
+        response.set_raw_header("X-RateLimit-Reset-After", reset.to_string());
+
+        if guard.is_failure() {
+            response.set_status(Status::TooManyRequests);
         }
     }
 }
@@ -308,11 +311,14 @@ impl<'r> FromRequest<'r> for RatelimitInformation {
     type Error = u128;
 
     async fn from_request(request: &'r rocket::Request<'_>) -> Outcome<Self, Self::Error> {
-        Outcome::Success(match request.guard::<Ratelimiter>().await {
+        let info = match request.guard::<Ratelimiter>().await {
             Outcome::Success(ratelimiter) => RatelimitInformation::Success(ratelimiter),
-            Outcome::Failure((_, retry_after)) => RatelimitInformation::Failure { retry_after },
+            Outcome::Failure((_, ratelimiter)) => RatelimitInformation::Failure {
+                retry_after: ratelimiter.reset,
+            },
             _ => unreachable!(),
-        })
+        };
+        Outcome::Success(info)
     }
 }
 

crates/quark/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-quark"
-version = "0.6.11"
+version = "0.6.12"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 

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

@@ -5,7 +5,6 @@ use iso8601_timestamp::Timestamp;
 use crate::{
     events::client::EventV1,
     models::{
-        server::Role,
         server_member::{FieldsMember, MemberCompositeKey, MemberWithRoles, PartialMember},
         Member, Server,
     },
@@ -84,30 +83,13 @@ impl Member {
             FieldsMember::Timeout => self.timeout = None,
         }
     }
-
-    pub fn with_roles(&self, roles: HashMap<String, Role>) -> MemberWithRoles {
-        MemberWithRoles {
-            id: self.id.clone(),
-            joined_at: self.joined_at,
-            nickname: self.nickname.clone(),
-            avatar: self.avatar.clone(),
-            roles,
-            timeout: self.timeout,
-        }
-    }
 }
+
 impl MemberWithRoles {
     pub fn new(server_id: String, user_id: String) -> Self {
         Self {
-            id: MemberCompositeKey {
-                server: server_id,
-                user: user_id,
-            },
-            joined_at: Timestamp::now_utc(),
-            nickname: None,
-            avatar: None,
+            member: Member::new(server_id, user_id),
             roles: HashMap::new(),
-            timeout: None,
         }
     }
 }

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

@@ -22,10 +22,14 @@ impl AbstractServerMember for MongoDb {
     }
 
     async fn fetch_member_with_roles(&self, server: &str, user: &str) -> Result<MemberWithRoles> {
-        Ok(self
-            .fetch_member(server, user)
-            .await?
-            .with_roles(self.fetch_server(server).await?.roles))
+        let member = self.fetch_member(server, user).await?;
+        let server_roles = self.fetch_server(server).await?.roles;
+        let roles = member
+            .roles
+            .iter()
+            .filter_map(|id| server_roles.get(id).map(|r| (id.clone(), r.clone())))
+            .collect();
+        Ok(MemberWithRoles { member, roles })
     }
 
     async fn insert_member(&self, member: &Member) -> Result<()> {

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

@@ -47,47 +47,27 @@ pub struct Member {
 }
 
 /// Representation of a member of a server on Revolt With Role Data
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, OptionalStruct)]
-#[optional_derive(Serialize, Deserialize, JsonSchema, Debug, Default, Clone)]
-#[opt_skip_serializing_none]
-#[opt_some_priority]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
 pub struct MemberWithRoles {
-    /// Unique member id
-    #[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>,
-    /// Avatar attachment
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub avatar: Option<File>,
-
-    /// Member's roles
-    #[serde(skip_serializing_if = "HashMap::is_empty", default)]
+    pub member: Member,
     pub roles: HashMap<String, Role>,
-    /// Timestamp this member is timed out until
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub timeout: Option<Timestamp>,
 }
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)]
+#[serde(untagged)]
 pub enum MemberResponse {
-    Members(Member),
-    MembersWithRoles(MemberWithRoles),
+    Member(Member),
+    MemberWithRoles(MemberWithRoles),
 }
 
 impl From<Member> for MemberResponse {
     fn from(value: Member) -> Self {
-        Self::Members(value)
+        Self::Member(value)
     }
 }
 impl From<MemberWithRoles> for MemberResponse {
     fn from(value: MemberWithRoles) -> Self {
-        Self::MembersWithRoles(value)
+        Self::MemberWithRoles(value)
     }
 }
 /// Optional fields on server member object