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.

Sign up for GitHub

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

Jump to bottom

Add user accent_color and banner fields #1127

Merged
merged 3 commits into from
Sep 17, 2021
Merged

Add user accent_color and banner fields #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41303a4
feat(model/user): add accent_color and banner
zeylahellyer Aug 23, 2021
4f008fc
Merge branch 'main' into feat/model/user-accent-color-and-banner
7596ff Sep 8, 2021
4b84280
not actually exclusive
zeylahellyer Sep 10, 2021
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
6 changes: 6 additions & 0 deletions cache/in-memory/src/event/interaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ mod tests {
application_id: None,
attachments: Vec::new(),
author: User {
accent_color: None,
avatar: Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -166,7 +168,9 @@ mod tests {
tags: None,
}]),
users: Vec::from([User {
accent_color: None,
avatar: Some("different avatar".into()),
banner: None,
bot: false,
discriminator: "5678".into(),
email: None,
Expand Down Expand Up @@ -194,7 +198,9 @@ mod tests {
premium_since: None,
roles: Vec::new(),
user: Some(User {
accent_color: None,
avatar: Some("avatar string".into()),
banner: None,
bot: false,
discriminator: "1234".into(),
email: None,
Expand Down
2 changes: 2 additions & 0 deletions cache/in-memory/src/event/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ mod tests {
application_id: None,
attachments: Vec::new(),
author: User {
accent_color: None,
avatar: Some("".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down
2 changes: 2 additions & 0 deletions cache/in-memory/src/event/voice_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,9 @@ mod tests {
premium_since: None,
roles: Vec::new(),
user: User {
accent_color: None,
avatar: Some("".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down
2 changes: 2 additions & 0 deletions cache/in-memory/src/model/member.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ mod tests {

fn user() -> User {
User {
accent_color: None,
avatar: None,
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down
10 changes: 10 additions & 0 deletions cache/in-memory/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ pub fn cache_with_message_and_reactions() -> InMemoryCache {
application_id: None,
attachments: Vec::new(),
author: User {
accent_color: None,
avatar: Some("".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -87,7 +89,9 @@ pub fn cache_with_message_and_reactions() -> InMemoryCache {
premium_since: None,
roles: Vec::new(),
user: User {
accent_color: None,
avatar: Some("".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -119,7 +123,9 @@ pub fn cache_with_message_and_reactions() -> InMemoryCache {
premium_since: None,
roles: Vec::new(),
user: User {
accent_color: None,
avatar: Some("".to_owned()),
banner: None,
bot: false,
discriminator: "0002".to_owned(),
email: None,
Expand Down Expand Up @@ -149,7 +155,9 @@ pub fn cache_with_message_and_reactions() -> InMemoryCache {

pub fn current_user(id: u64) -> CurrentUser {
CurrentUser {
accent_color: Some(16711680),
avatar: None,
banner: None,
bot: true,
discriminator: "9876".to_owned(),
email: None,
Expand Down Expand Up @@ -251,7 +259,9 @@ pub fn voice_state(

pub fn user(id: UserId) -> User {
User {
accent_color: None,
avatar: None,
banner: Some("06c16474723fe537c283b8efa61a30c8".to_owned()),
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down
16 changes: 14 additions & 2 deletions model/src/application/interaction/application_command/data/resolved.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ mod tests {
application_id: None,
attachments: Vec::new(),
author: User {
accent_color: None,
avatar: Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -349,7 +351,9 @@ mod tests {
tags: None,
}]),
users: Vec::from([User {
accent_color: None,
avatar: Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: Some("address@example.com".to_owned()),
Expand Down Expand Up @@ -418,11 +422,15 @@ mod tests {
Token::Str("author"),
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down Expand Up @@ -543,11 +551,15 @@ mod tests {
Token::Str("300"),
Token::Struct {
name: "User",
len: 12,
len: 14,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down
2 changes: 2 additions & 0 deletions model/src/application/interaction/message_component/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ mod tests {

fn user(id: UserId) -> User {
User {
accent_color: None,
avatar: None,
banner: None,
bot: false,
discriminator: "4444".to_owned(),
email: None,
Expand Down
16 changes: 14 additions & 2 deletions model/src/application/interaction/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,9 @@ mod test {
messages: Vec::new(),
roles: Vec::new(),
users: vec![User {
accent_color: None,
avatar: Some("avatar string".into()),
banner: None,
bot: false,
discriminator: "1111".into(),
email: None,
Expand Down Expand Up @@ -336,7 +338,9 @@ mod test {
premium_since: None,
roles: Vec::new(),
user: Some(User {
accent_color: None,
avatar: Some("avatar string".into()),
banner: None,
bot: false,
discriminator: "1111".into(),
email: None,
Expand Down Expand Up @@ -404,11 +408,15 @@ mod test {
Token::Str("600"),
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("avatar string"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down Expand Up @@ -459,11 +467,15 @@ mod test {
Token::Some,
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("avatar string"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down
16 changes: 14 additions & 2 deletions model/src/channel/message/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ mod tests {
application_id: None,
attachments: Vec::new(),
author: User {
accent_color: None,
avatar: Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -173,11 +175,15 @@ mod tests {
Token::Str("author"),
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down Expand Up @@ -286,7 +292,9 @@ mod tests {
application_id: Some(ApplicationId(1)),
attachments: Vec::new(),
author: User {
accent_color: None,
avatar: Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -404,11 +412,15 @@ mod tests {
Token::Str("author"),
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down
8 changes: 7 additions & 1 deletion model/src/channel/message/sticker/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ mod tests {
sort_value: Some(1),
tags: "foo,bar,baz".into(),
user: Some(User {
accent_color: None,
avatar: Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: Some("address@example.com".to_owned()),
Expand Down Expand Up @@ -189,11 +191,15 @@ mod tests {
Token::Some,
Token::Struct {
name: "User",
len: 13,
len: 15,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down
8 changes: 7 additions & 1 deletion model/src/channel/reaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ mod tests {
premium_since: None,
roles: vec![RoleId(5)],
user: User {
accent_color: None,
avatar: Some("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_owned()),
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -262,11 +264,15 @@ mod tests {
Token::Str("user"),
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::Some,
Token::Str("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down
8 changes: 7 additions & 1 deletion model/src/channel/webhook/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ mod tests {
token: Some("a token".to_owned()),
url: Some("https://a-url".to_owned()),
user: Some(User {
accent_color: None,
avatar: None,
banner: None,
bot: false,
discriminator: "0001".to_owned(),
email: None,
Expand Down Expand Up @@ -240,10 +242,14 @@ mod tests {
Token::Some,
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down
8 changes: 7 additions & 1 deletion model/src/gateway/payload/member_add.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ mod tests {
roles: vec![],
user: User {
id: UserId(2),
accent_color: None,
avatar: None,
banner: None,
bot: false,
discriminator: "0987".to_string(),
name: "ab".to_string(),
Expand Down Expand Up @@ -86,10 +88,14 @@ mod tests {
Token::Str("user"),
Token::Struct {
name: "User",
len: 5,
len: 7,
},
Token::Str("accent_color"),
Token::None,
Token::Str("avatar"),
Token::None,
Token::Str("banner"),
Token::None,
Token::Str("bot"),
Token::Bool(false),
Token::Str("discriminator"),
Expand Down
Loading