feat: pronouns

crates/core/database/src/models/users/model.rs

@@ -44,6 +44,10 @@ auto_derived_partial!(
         /// Bot information
         #[serde(skip_serializing_if = "Option::is_none")]
         pub bot: Option<BotInformation>,
+
+        // User's displayed pronouns
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub pronouns: Option<Vec<String>>,
     },
     "PartialUser"
 );
@@ -114,6 +118,7 @@ auto_derived!(
         StatusPresence,
         ProfileContent,
         ProfileBackground,
+        Pronouns,
     }
 );
 
@@ -180,6 +185,7 @@ impl User {
                     x.background = None;
                 }
             }
+            FieldsUser::Pronouns => self.pronouns = None,
         }
     }
 
@@ -198,6 +204,7 @@ impl User {
                 FieldsUser::StatusPresence,
                 FieldsUser::ProfileContent,
                 FieldsUser::ProfileBackground,
+                FieldsUser::Pronouns,
             ],
         )
         .await

crates/core/database/src/models/users/ops/mongodb.rs

@@ -295,6 +295,7 @@ impl IntoDocumentPath for FieldsUser {
             FieldsUser::ProfileContent => "profile.content",
             FieldsUser::StatusPresence => "status.presence",
             FieldsUser::StatusText => "status.text",
+            FieldsUser::Pronouns => "pronouns",
         })
     }
 }

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

@@ -270,6 +270,9 @@ impl crate::User {
             relationship,
             online: can_see_profile && revolt_presence::is_online(&self.id).await,
             id: self.id,
+            pronouns: self
+                .pronouns
+                .map(|pronouns| pronouns.iter().map(|pronoun| pronoun.to_owned()).collect()),
         }
     }
 }

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

@@ -40,6 +40,9 @@ auto_derived!(
         #[serde(skip_serializing_if = "Option::is_none")]
         pub bot: Option<BotInformation>,
 
+        // User's displayed pronouns
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub pronouns: Option<Vec<String>>,
         /// Current session user's relationship with this user
         pub relationship: RelationshipStatus,
         /// Whether this user is currently online

crates/delta/src/routes/users/edit_user.rs

@@ -52,6 +52,11 @@ pub struct DataEditUser {
     /// Fields to remove from user object
     #[validate(length(min = 1))]
     remove: Option<Vec<FieldsUser>>,
+
+    // User's displayed pronouns
+    #[cfg_attr(feature = "validator", validate(length(min = 1, max = 5)))]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub pronouns: Option<Vec<String>>,
 }
 
 /// # Edit User
@@ -96,6 +101,7 @@ pub async fn req(
         && data.badges.is_none()
         && data.flags.is_none()
         && data.remove.is_none()
+        && data.pronouns.is_none()
     {
         return Ok(Json(user));
     }
@@ -125,6 +131,7 @@ pub async fn req(
         display_name: data.display_name,
         badges: data.badges,
         flags: data.flags,
+        pronouns: data.pronouns,
         ..Default::default()
     };
 

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

@@ -71,6 +71,7 @@ impl User {
                 }
             }
             FieldsUser::DisplayName => self.display_name = None,
+            FieldsUser::Pronouns => self.pronouns = None,
         }
     }
 

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

@@ -338,6 +338,7 @@ impl IntoDocumentPath for FieldsUser {
             FieldsUser::StatusPresence => "status.presence",
             FieldsUser::StatusText => "status.text",
             FieldsUser::DisplayName => "display_name",
+            FieldsUser::Pronouns => "pronouns",
         })
     }
 }

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

@@ -167,6 +167,11 @@ pub struct User {
     /// Whether this user is currently online
     #[serde(skip_serializing_if = "Option::is_none")]
     pub online: Option<bool>,
+
+    // User's displayed pronouns
+    #[cfg_attr(feature = "validator", validate(length(min = 1, max = 5)))]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub pronouns: Option<Vec<String>>,
 }
 
 /// Optional fields on user object
@@ -178,6 +183,7 @@ pub enum FieldsUser {
     ProfileContent,
     ProfileBackground,
     DisplayName,
+    Pronouns,
 }
 
 /// Enumeration providing a hint to the type of user we are handling