kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix a deserialization error on Spacebar 

See spacebarchat/server#1188

A deserialization error was happening with get_user_profile, where pronouns should have been serialized as an empty string, but were instead serialized as null.
This commit is contained in:
kozabrada123 2024-08-18 14:45:12 +02:00
parent 28e3f21cbf
commit fa859f616a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/types/entities/user.rs
View File

@ -6,7 +6,7 @@ use crate::errors::ChorusError;
use crate::types::utils::Snowflake; use crate::types::utils::Snowflake;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_aux::prelude::deserialize_option_number_from_string; use serde_aux::prelude::{deserialize_option_number_from_string, deserialize_default_from_null};
use serde_repr::{Deserialize_repr, Serialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use std::array::TryFromSliceError; use std::array::TryFromSliceError;
use std::fmt::Debug; use std::fmt::Debug;
@ -257,6 +257,9 @@ pub struct UserProfileMetadata {
/// The guild ID this profile applies to, if it is a guild profile. /// The guild ID this profile applies to, if it is a guild profile.
pub guild_id: Option<Snowflake>, pub guild_id: Option<Snowflake>,
/// The user's pronouns, up to 40 characters /// The user's pronouns, up to 40 characters
#[serde(deserialize_with = "deserialize_default_from_null")]
// Note: spacebar will send this is as null, while it should be ""
// See issue 1188
pub pronouns: String, pub pronouns: String,
/// The user's bio / description, up to 190 characters /// The user's bio / description, up to 190 characters
pub bio: Option<String>, pub bio: Option<String>,