Skip to content

Commit

Permalink
feat(model) add support for avatar decorations (#2242)
Browse files Browse the repository at this point in the history 
Ref:
- discord/discord-api-docs#5723
  • Loading branch information
@suneettipirneni
suneettipirneni committed Jul 16, 2023
1 parent b606d79 commit c2ce830
Show file tree
Hide file tree
Showing 33 changed files with 150 additions and 32 deletions.
3 changes: 3 additions & 0 deletions twilight-cache-inmemory/src/event/interaction.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ mod tests {
author: User {
accent_color: None,
avatar: Some(avatar3),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -249,6 +250,7 @@ mod tests {
User {
accent_color: None,
avatar: Some(avatar2),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 5678,
Expand Down Expand Up @@ -287,6 +289,7 @@ mod tests {
user: Some(User {
accent_color: None,
avatar: Some(avatar3),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1234,
Expand Down
1 change: 1 addition & 0 deletions twilight-cache-inmemory/src/event/message.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ mod tests {
author: User {
accent_color: None,
avatar: Some(avatar),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down
1 change: 1 addition & 0 deletions twilight-cache-inmemory/src/event/voice_state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ mod tests {
user: User {
accent_color: None,
avatar: Some(avatar),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down
1 change: 1 addition & 0 deletions twilight-cache-inmemory/src/model/member.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ mod tests {
User {
accent_color: None,
avatar: None,
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down
1 change: 1 addition & 0 deletions twilight-cache-inmemory/src/model/sticker.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ mod tests {
user: Some(User {
accent_color: None,
avatar: Some(avatar),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down
4 changes: 4 additions & 0 deletions twilight-cache-inmemory/src/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pub fn cache_with_message_and_reactions() -> InMemoryCache {
author: User {
accent_color: None,
avatar: Some(avatar),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -120,6 +121,7 @@ pub fn cache_with_message_and_reactions() -> InMemoryCache {
user: User {
accent_color: None,
avatar: Some(avatar),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -160,6 +162,7 @@ pub fn cache_with_message_and_reactions() -> InMemoryCache {
user: User {
accent_color: None,
avatar: Some(user_5_avatar),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 2,
Expand Down Expand Up @@ -353,6 +356,7 @@ pub fn user(id: Id<UserMarker>) -> User {
User {
accent_color: None,
avatar: None,
avatar_decoration: None,
banner: Some(banner),
bot: false,
discriminator: 1,
Expand Down
10 changes: 8 additions & 2 deletions twilight-model/src/application/interaction/application_command/resolved.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ mod tests {
author: User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -259,6 +260,7 @@ mod tests {
User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -377,13 +379,15 @@ mod tests {
Token::Str("author"),
Token::Struct {
name: "User",
len: 8,
len: 9,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down Expand Up @@ -510,13 +514,15 @@ mod tests {
Token::Str("300"),
Token::Struct {
name: "User",
len: 15,
len: 16,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down
10 changes: 8 additions & 2 deletions twilight-model/src/application/interaction/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ mod tests {
User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1111,
Expand Down Expand Up @@ -572,6 +573,7 @@ mod tests {
user: Some(User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1111,
Expand Down Expand Up @@ -689,13 +691,15 @@ mod tests {
Token::Str("600"),
Token::Struct {
name: "User",
len: 8,
len: 9,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down Expand Up @@ -758,13 +762,15 @@ mod tests {
Token::Some,
Token::Struct {
name: "User",
len: 8,
len: 9,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down
5 changes: 4 additions & 1 deletion twilight-model/src/channel/message/interaction.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ mod tests {
user: User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: Some(image_hash::BANNER),
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -126,13 +127,15 @@ mod tests {
Token::Str("user"),
Token::Struct {
name: "User",
len: 15,
len: 16,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::Some,
Token::Str(image_hash::BANNER_INPUT),
Expand Down
10 changes: 8 additions & 2 deletions twilight-model/src/channel/message/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ mod tests {
author: User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -297,13 +298,15 @@ mod tests {
Token::Str("author"),
Token::Struct {
name: "User",
len: 8,
len: 9,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down Expand Up @@ -425,6 +428,7 @@ mod tests {
author: User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -545,13 +549,15 @@ mod tests {
Token::Str("author"),
Token::Struct {
name: "User",
len: 8,
len: 9,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down
5 changes: 4 additions & 1 deletion twilight-model/src/channel/message/sticker/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ mod tests {
user: Some(User {
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -211,13 +212,15 @@ mod tests {
Token::Some,
Token::Struct {
name: "User",
len: 16,
len: 17,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str(image_hash::AVATAR_INPUT),
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down
5 changes: 4 additions & 1 deletion twilight-model/src/channel/webhook/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ mod tests {
user: Some(User {
accent_color: None,
avatar: None,
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -240,12 +241,14 @@ mod tests {
Token::Some,
Token::Struct {
name: "User",
len: 8,
len: 9,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::None,
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down
2 changes: 1 addition & 1 deletion twilight-model/src/gateway/event/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ mod tests {
// requires a variable to be used in a function, so this is a false
// positive.
#[allow(dead_code)]
const EVENT_THRESHOLD: usize = 208;
const EVENT_THRESHOLD: usize = 224;

const_assert!(mem::size_of::<Event>() == EVENT_THRESHOLD);

Expand Down
5 changes: 4 additions & 1 deletion twilight-model/src/gateway/payload/incoming/member_add.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ mod tests {
id: Id::new(2),
accent_color: None,
avatar: None,
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 987,
Expand Down Expand Up @@ -103,12 +104,14 @@ mod tests {
Token::Str("user"),
Token::Struct {
name: "User",
len: 7,
len: 8,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::None,
Token::Str("avatar_decoration"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Expand Down
4 changes: 4 additions & 0 deletions twilight-model/src/gateway/payload/incoming/member_chunk.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ mod tests {
id: Id::new(2),
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: true,
discriminator: 1,
Expand Down Expand Up @@ -361,6 +362,7 @@ mod tests {
id: Id::new(3),
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: true,
discriminator: 1,
Expand Down Expand Up @@ -391,6 +393,7 @@ mod tests {
id: Id::new(5),
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down Expand Up @@ -421,6 +424,7 @@ mod tests {
id: Id::new(6),
accent_color: None,
avatar: Some(image_hash::AVATAR),
avatar_decoration: None,
banner: None,
bot: false,
discriminator: 1,
Expand Down

0 comments on commit c2ce830

Please sign in to comment.