feat: add remove "displayname" field

fix: actually update the display name
fix: display name is optional
2026-07-06 03:06:04 +00:00 · 2023-06-11 12:05:08 +01:00 · 2023-06-11 11:50:21 +01:00 · 2023-06-11 10:56:03 +01:00 · 2023-06-11 10:49:51 +01:00
15 changed files with 39 additions and 29 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2837,7 +2837,7 @@ dependencies = [

 [[package]]
 name = "revolt-bonfire"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "async-std",
 "async-tungstenite",
@@ -2854,7 +2854,7 @@ dependencies = [

 [[package]]
 name = "revolt-database"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "async-recursion",
 "async-std",
@@ -2885,7 +2885,7 @@ dependencies = [

 [[package]]
 name = "revolt-delta"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "async-channel",
 "async-std",
@@ -2925,7 +2925,7 @@ dependencies = [

 [[package]]
 name = "revolt-models"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "revolt-permissions",
 "revolt_optional_struct",
@@ -2936,7 +2936,7 @@ dependencies = [

 [[package]]
 name = "revolt-permissions"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "async-std",
 "async-trait",
@@ -2950,7 +2950,7 @@ dependencies = [

 [[package]]
 name = "revolt-presence"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "async-std",
 "log",
@@ -2961,7 +2961,7 @@ dependencies = [

 [[package]]
 name = "revolt-quark"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "async-lock",
 "async-recursion",
@@ -3012,7 +3012,7 @@ dependencies = [

 [[package]]
 name = "revolt-result"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
 "revolt_okapi",
 "revolt_rocket_okapi",
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.6.0"
+version = "0.6.1"
 license = "AGPL-3.0-or-later"
 edition = "2021"

--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = [ "Paul Makles <me@insrt.uk>" ]
@@ -22,10 +22,10 @@ default = [ "mongodb", "async-std-runtime" ]

 [dependencies]
 # Core
-revolt-result = { version = "0.6.0", path = "../result" }
-revolt-models = { version = "0.6.0", path = "../models" }
-revolt-presence = { version = "0.6.0", path = "../presence" }
-revolt-permissions = { version = "0.6.0", path = "../permissions", features = [ "serde", "bson" ] }
+revolt-result = { version = "0.6.1", path = "../result" }
+revolt-models = { version = "0.6.1", path = "../models" }
+revolt-presence = { version = "0.6.1", path = "../presence" }
+revolt-permissions = { version = "0.6.1", path = "../permissions", features = [ "serde", "bson" ] }

 # Utility
 log = "0.4"
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -16,7 +16,8 @@ auto_derived_partial!(
        /// Discriminator
        pub discriminator: String,
        /// Display name
-        pub display_name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub display_name: Option<String>,
        #[serde(skip_serializing_if = "Option::is_none")]
        /// Avatar attachment
        pub avatar: Option<File>,
@@ -208,8 +209,10 @@ pub static DISCRIMINATOR_SEARCH_SPACE: Lazy<HashSet<String>> = Lazy::new(|| {
        .map(|v| format!("{:0>4}", v))
        .collect::<HashSet<String>>();

-    for discrim in [1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999] {
-        set.remove(&discrim.to_string());
+    for discrim in [
+        123, 1234, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999,
+    ] {
+        set.remove(&format!("{:0>4}", discrim));
    }

    set.into_iter().collect()
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = [ "Paul Makles <me@insrt.uk>" ]
@@ -18,7 +18,7 @@ default = [ "serde", "partials" ]

 [dependencies]
 # Core
-revolt-permissions = { version = "0.6.0", path = "../permissions" }
+revolt-permissions = { version = "0.6.1", path = "../permissions" }

 # Serialisation
 revolt_optional_struct = { version = "0.2.0", optional = true }
--- a/crates/core/models/src/v0/users.rs
+++ b/crates/core/models/src/v0/users.rs
@@ -11,7 +11,8 @@ auto_derived!(
        /// Discriminator
        pub discriminator: String,
        /// Display name
-        pub display_name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub display_name: Option<String>,
        #[serde(skip_serializing_if = "Option::is_none")]
        /// Avatar attachment
        pub avatar: Option<File>,
--- a/crates/core/permissions/Cargo.toml
+++ b/crates/core/permissions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = [ "Paul Makles <me@insrt.uk>" ]
--- a/crates/core/presence/Cargo.toml
+++ b/crates/core/presence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = [ "Paul Makles <me@insrt.uk>" ]
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = [ "Paul Makles <me@insrt.uk>" ]
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.6.0"
+version = "0.6.1"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
--- a/crates/delta/src/routes/users/edit_user.rs
+++ b/crates/delta/src/routes/users/edit_user.rs
@@ -27,7 +27,6 @@ pub struct UserProfileData {
 #[derive(Validate, Serialize, Deserialize, JsonSchema)]
 pub struct DataEditUser {
    /// New display name
-    #[serde(rename = "displayName")]
    #[validate(length(min = 2, max = 32), regex = "RE_DISPLAY_NAME")]
    display_name: Option<String>,
    /// Attachment Id for avatar
@@ -123,6 +122,7 @@ pub async fn req(
    }

    let mut partial: PartialUser = PartialUser {
+        display_name: data.display_name,
        badges: data.badges,
        flags: data.flags,
        ..Default::default()
--- a/crates/quark/Cargo.toml
+++ b/crates/quark/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-quark"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"

--- a/crates/quark/src/impl/generic/users/user.rs
+++ b/crates/quark/src/impl/generic/users/user.rs
@@ -68,6 +68,7 @@ impl User {
                    x.background = None;
                }
            }
+            FieldsUser::DisplayName => self.display_name = None,
        }
    }

@@ -457,8 +458,10 @@ pub static DISCRIMINATOR_SEARCH_SPACE_QUARK: Lazy<HashSet<String>> = Lazy::new(|
        .map(|v| format!("{:0>4}", v))
        .collect::<HashSet<String>>();

-    for discrim in [1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999] {
-        set.remove(&discrim.to_string());
+    for discrim in [
+        123, 1234, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999,
+    ] {
+        set.remove(&format!("{:0>4}", discrim));
    }

    set.into_iter().collect()
--- a/crates/quark/src/impl/mongo/users/user.rs
+++ b/crates/quark/src/impl/mongo/users/user.rs
@@ -337,6 +337,7 @@ impl IntoDocumentPath for FieldsUser {
            FieldsUser::ProfileContent => "profile.content",
            FieldsUser::StatusPresence => "status.presence",
            FieldsUser::StatusText => "status.text",
+            FieldsUser::DisplayName => "display_name",
        })
    }
 }
--- a/crates/quark/src/models/users/user.rs
+++ b/crates/quark/src/models/users/user.rs
@@ -131,7 +131,8 @@ pub struct User {
    /// Discriminator
    pub discriminator: String,
    /// Display name
-    pub display_name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_name: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
    /// Avatar attachment
    pub avatar: Option<File>,
@@ -176,6 +177,7 @@ pub enum FieldsUser {
    StatusPresence,
    ProfileContent,
    ProfileBackground,
+    DisplayName,
 }

 /// Enumeration providing a hint to the type of user we are handling
Author	SHA1	Message	Date
Paul Makles	0578a05a05	feat: add remove "displayname" field	2023-06-11 12:05:08 +01:00
Paul Makles	9a412b3e08	fix: actually update the display name	2023-06-11 11:50:21 +01:00
Paul Makles	8deec1f80a	fix: display name is optional	2023-06-11 10:56:03 +01:00
Paul Makles	26afbeed84	chore: extend discriminator block list	2023-06-11 10:49:51 +01:00