Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(model): Add global_name to CurrentUser #2412

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions twilight-cache-inmemory/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ pub fn current_user(id: u64) -> CurrentUser {
public_flags: None,
flags: None,
locale: None,
global_name: None,
}
}

Expand Down
1 change: 1 addition & 0 deletions twilight-model/src/gateway/payload/incoming/ready.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ mod tests {
premium_type: None,
public_flags: None,
verified: None,
global_name: None,
},
version: 8,
};
Expand Down
16 changes: 12 additions & 4 deletions twilight-model/src/user/current_user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ pub struct CurrentUser {
/// All flags on a user's account.
#[serde(skip_serializing_if = "Option::is_none")]
pub flags: Option<UserFlags>,
/// User's global display name, if set. For bots, this is the application name.
#[serde(skip_serializing_if = "Option::is_none")]
pub global_name: Option<String>,
/// User's id.
pub id: Id<UserMarker>,
/// User's chosen language option.
Expand Down Expand Up @@ -136,7 +139,7 @@ mod tests {
vec![
Token::Struct {
name: "CurrentUser",
len: 14,
len: 15,
},
Token::Str("accent_color"),
Token::None,
Expand All @@ -156,6 +159,9 @@ mod tests {
Token::Str("flags"),
Token::Some,
Token::U64(1),
Token::Str("global_name"),
Token::Some,
Token::Str("twilight sparkle"),
Token::Str("id"),
Token::NewtypeStruct { name: "Id" },
Token::Str("1"),
Expand Down Expand Up @@ -196,6 +202,7 @@ mod tests {
public_flags: Some(UserFlags::STAFF),
flags: None,
locale: Some("test locale".to_owned()),
global_name: None,
};

// Deserializing a current user with a string discriminator (which
Expand All @@ -217,14 +224,15 @@ mod tests {
bot: true,
discriminator: 9999,
email: Some("[email protected]".to_owned()),
flags: Some(UserFlags::STAFF),
global_name: Some("twilight sparkle".to_owned()),
id: Id::new(1),
locale: Some("test locale".to_owned()),
mfa_enabled: true,
name: "test name".to_owned(),
verified: Some(true),
premium_type: Some(PremiumType::NitroClassic),
public_flags: Some(UserFlags::STAFF),
flags: Some(UserFlags::STAFF),
locale: Some("test locale".to_owned()),
verified: Some(true),
};

// Deserializing a current user with a string discriminator (which
Expand Down
2 changes: 1 addition & 1 deletion twilight-model/src/user/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ pub struct User {
pub email: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub flags: Option<UserFlags>,
/// User's global display name, if set. For bots, this is the application name
/// User's global display name, if set. For bots, this is the application name.
#[serde(skip_serializing_if = "Option::is_none")]
pub global_name: Option<String>,
pub id: Id<UserMarker>,
Expand Down
1 change: 1 addition & 0 deletions twilight-standby/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1407,6 +1407,7 @@ mod tests {
public_flags: None,
flags: None,
locale: None,
global_name: None,
},
version: 6,
};
Expand Down