feat(cache-inmemory, model): add missing banner fields to member structs

examples/cache-optimization/models/member.rs

@@ -15,6 +15,7 @@ pub struct MinimalCachedMember {
     pub user_id: Id<UserMarker>,
     pub roles: Vec<Id<RoleMarker>>,
     pub avatar: Option<ImageHash>,
+    pub banner: Option<ImageHash>,
 }
 
 impl From<Member> for MinimalCachedMember {
@@ -23,6 +24,7 @@ impl From<Member> for MinimalCachedMember {
             user_id: member.user.id,
             roles: member.roles,
             avatar: member.avatar,
+            banner: member.banner,
         }
     }
 }
@@ -33,6 +35,7 @@ impl From<(Id<UserMarker>, PartialMember)> for MinimalCachedMember {
             user_id,
             roles: member.roles,
             avatar: member.avatar,
+            banner: member.banner,
         }
     }
 }
@@ -43,13 +46,17 @@ impl From<ComputedInteractionMember> for MinimalCachedMember {
             user_id: member.user_id,
             roles: member.interaction_member.roles,
             avatar: member.avatar,
+            banner: member.banner,
         }
     }
 }
 
 impl PartialEq<Member> for MinimalCachedMember {
     fn eq(&self, other: &Member) -> bool {
-        self.user_id == other.user.id && self.roles == other.roles && self.avatar == other.avatar
+        self.user_id == other.user.id
+            && self.roles == other.roles
+            && self.avatar == other.avatar
+            && self.banner == other.banner
     }
 }
 
@@ -61,12 +68,13 @@ impl PartialEq<PartialMember> for MinimalCachedMember {
             .is_some_and(|user| user.id == self.user_id)
             && self.roles == other.roles
             && self.avatar == other.avatar
+            && self.banner == other.banner
     }
 }
 
 impl PartialEq<InteractionMember> for MinimalCachedMember {
     fn eq(&self, other: &InteractionMember) -> bool {
-        self.roles == other.roles && self.avatar == other.avatar
+        self.roles == other.roles && self.avatar == other.avatar && self.banner == other.banner
     }
 }
 
@@ -75,6 +83,10 @@ impl CacheableMember for MinimalCachedMember {
         self.avatar
     }
 
+    fn banner(&self) -> Option<ImageHash> {
+        self.banner
+    }
+
     fn communication_disabled_until(&self) -> Option<Timestamp> {
         None
     }
@@ -95,5 +107,6 @@ impl CacheableMember for MinimalCachedMember {
         self.user_id = member_update.user.id;
         self.roles.clone_from(&member_update.roles);
         self.avatar = member_update.avatar;
+        self.banner = member_update.banner;
     }
 }

twilight-cache-inmemory/src/event/member.rs

@@ -77,10 +77,10 @@ impl<CacheModels: CacheableModels> InMemoryCache<CacheModels> {
     ) {
         let id = (guild_id, user_id);
 
-        let (avatar, deaf, mute) = match self.members.get(&id) {
+        let (avatar, banner, deaf, mute) = match self.members.get(&id) {
             Some(m) if &*m == member => return,
-            Some(m) => (m.avatar(), m.deaf(), m.mute()),
-            None => (None, None, None),
+            Some(m) => (m.avatar(), m.banner(), m.deaf(), m.mute()),
+            None => (None, None, None, None),
         };
 
         self.guild_members
@@ -90,6 +90,7 @@ impl<CacheModels: CacheableModels> InMemoryCache<CacheModels> {
 
         let cached = CacheModels::Member::from(ComputedInteractionMember {
             avatar,
+            banner,
             deaf,
             interaction_member: member.clone(),
             mute,
@@ -324,6 +325,7 @@ mod tests {
         // Test that a member update also updates the user.
         cache.update(&MemberUpdate {
             avatar: None,
+            banner: None,
             communication_disabled_until: None,
             guild_id,
             flags: None,

twilight-cache-inmemory/src/model/member.rs

@@ -20,6 +20,8 @@ use twilight_model::{
 pub struct ComputedInteractionMember {
     /// Member's guild avatar.
     pub avatar: Option<ImageHash>,
+    /// Member's guild banner.
+    pub banner: Option<ImageHash>,
     /// Whether the member is deafened in a voice channel.
     pub deaf: Option<bool>,
     /// Member that performed the interaction.
@@ -64,6 +66,11 @@ impl CachedMember {
         self.avatar
     }
 
+    /// Member's guild banner.
+    pub const fn banner(&self) -> Option<ImageHash> {
+        self.banner
+    }
+
     /// When the user can resume communication in a guild again.
     ///
     /// Checking if this value is [`Some`] is not enough to know if a used is currently
@@ -166,6 +173,7 @@ impl From<ComputedInteractionMember> for CachedMember {
     fn from(member: ComputedInteractionMember) -> Self {
         let ComputedInteractionMember {
             avatar,
+            banner,
             deaf,
             mute,
             user_id,
@@ -174,7 +182,7 @@ impl From<ComputedInteractionMember> for CachedMember {
         let InteractionMember {
             avatar: _,
             avatar_decoration_data,
-            banner,
+            banner: _,
             communication_disabled_until,
             flags,
             joined_at,
@@ -242,6 +250,7 @@ impl From<(Id<UserMarker>, PartialMember)> for CachedMember {
 impl PartialEq<Member> for CachedMember {
     fn eq(&self, other: &Member) -> bool {
         self.avatar == other.avatar
+            && self.banner == other.banner
             && self.communication_disabled_until == other.communication_disabled_until
             && self.deaf == Some(other.deaf)
             && self.joined_at == other.joined_at
@@ -289,6 +298,10 @@ impl CacheableMember for CachedMember {
         self.avatar
     }
 
+    fn banner(&self) -> Option<ImageHash> {
+        self.banner
+    }
+
     fn deaf(&self) -> Option<bool> {
         self.deaf
     }
@@ -299,6 +312,7 @@ impl CacheableMember for CachedMember {
 
     fn update_with_member_update(&mut self, member_update: &MemberUpdate) {
         self.avatar = member_update.avatar;
+        self.banner = member_update.banner;
         self.deaf = member_update.deaf.or_else(|| self.deaf());
         self.mute = member_update.mute.or_else(|| self.mute());
         self.nick.clone_from(&member_update.nick);

twilight-cache-inmemory/src/permission.rs

@@ -931,6 +931,7 @@ mod tests {
         });
         cache.update(&MemberUpdate {
             avatar: None,
+            banner: None,
             communication_disabled_until: None,
             guild_id: GUILD_ID,
             deaf: None,
@@ -1120,6 +1121,7 @@ mod tests {
         ));
         cache.update(&MemberUpdate {
             avatar: None,
+            banner: None,
             communication_disabled_until: Some(in_past),
             guild_id: GUILD_ID,
             deaf: None,

twilight-cache-inmemory/src/traits.rs

@@ -105,6 +105,9 @@ pub trait CacheableMember:
     /// Avatar of this member.
     fn avatar(&self) -> Option<ImageHash>;
 
+    /// Banner of this member.
+    fn banner(&self) -> Option<ImageHash>;
+
     /// Whether this member is deafened.
     fn deaf(&self) -> Option<bool>;
 

twilight-model/src/application/interaction/resolved.rs

@@ -197,7 +197,7 @@ mod tests {
                         avatar: Some(image_hash::AVATAR),
                         avatar_decoration: None,
                         avatar_decoration_data: None,
-                        banner: None,
+                        banner: Some(image_hash::BANNER),
                         bot: false,
                         discriminator: 1,
                         email: None,
@@ -430,7 +430,8 @@ mod tests {
                 Token::Str("avatar_decoration_data"),
                 Token::None,
                 Token::Str("banner"),
-                Token::None,
+                Token::Some,
+                Token::Str(image_hash::BANNER_INPUT),
                 Token::Str("bot"),
                 Token::Bool(false),
                 Token::Str("discriminator"),

twilight-model/src/channel/message/mention.rs

@@ -11,6 +11,8 @@ use serde::{Deserialize, Serialize};
 pub struct Mention {
     /// Hash of the user's avatar, if any.
     pub avatar: Option<ImageHash>,
+    /// Hash of the user's banner, if any.
+    pub banner: Option<ImageHash>,
     /// Whether the user is a bot.
     #[serde(default)]
     pub bot: bool,
@@ -59,6 +61,7 @@ mod tests {
     fn mention_without_member() {
         let value = Mention {
             avatar: None,
+            banner: None,
             bot: false,
             discriminator: 1,
             id: Id::new(1),
@@ -72,10 +75,12 @@ mod tests {
             &[
                 Token::Struct {
                     name: "Mention",
-                    len: 6,
+                    len: 7,
                 },
                 Token::Str("avatar"),
                 Token::None,
+                Token::Str("banner"),
+                Token::None,
                 Token::Str("bot"),
                 Token::Bool(false),
                 Token::Str("discriminator"),
@@ -99,6 +104,7 @@ mod tests {
 
         let value = Mention {
             avatar: None,
+            banner: None,
             bot: false,
             discriminator: 1,
             id: Id::new(1),
@@ -126,10 +132,12 @@ mod tests {
             &[
                 Token::Struct {
                     name: "Mention",
-                    len: 7,
+                    len: 8,
                 },
                 Token::Str("avatar"),
                 Token::None,
+                Token::Str("banner"),
+                Token::None,
                 Token::Str("bot"),
                 Token::Bool(false),
                 Token::Str("discriminator"),

twilight-model/src/gateway/payload/incoming/invite_create.rs

@@ -56,6 +56,8 @@ pub struct InviteCreate {
 pub struct PartialUser {
     /// Hash of the user's avatar.
     pub avatar: Option<ImageHash>,
+    /// Hash of the user's banner.
+    pub banner: Option<ImageHash>,
     /// Discriminator used to differentiate people with the same [`username`].
     ///
     /// [`username`]: Self::username
@@ -180,6 +182,7 @@ mod tests {
     fn partial_user() {
         let value = PartialUser {
             avatar: Some(image_hash::AVATAR),
+            banner: Some(image_hash::BANNER),
             discriminator: 123,
             id: Id::new(1),
             username: "twilight".to_owned(),
@@ -190,11 +193,14 @@ mod tests {
             &[
                 Token::Struct {
                     name: "PartialUser",
-                    len: 4,
+                    len: 5,
                 },
                 Token::Str("avatar"),
                 Token::Some,
                 Token::Str(image_hash::AVATAR_INPUT),
+                Token::Str("banner"),
+                Token::Some,
+                Token::Str(image_hash::BANNER_INPUT),
                 Token::Str("discriminator"),
                 Token::Str("0123"),
                 Token::Str("id"),

twilight-model/src/gateway/payload/incoming/member_update.rs

@@ -13,6 +13,8 @@ use serde::{Deserialize, Serialize};
 pub struct MemberUpdate {
     /// Member's guild avatar.
     pub avatar: Option<ImageHash>,
+    /// Member's guild banner.
+    pub banner: Option<ImageHash>,
     pub communication_disabled_until: Option<Timestamp>,
     pub guild_id: Id<GuildMarker>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -52,6 +54,7 @@ mod tests {
 
         let value = MemberUpdate {
             avatar: None,
+            banner: None,
             communication_disabled_until: Some(communication_disabled_until),
             guild_id: Id::new(1_234),
             flags: Some(MemberFlags::empty()),
@@ -90,10 +93,12 @@ mod tests {
             &[
                 Token::Struct {
                     name: "MemberUpdate",
-                    len: 12,
+                    len: 13,
                 },
                 Token::Str("avatar"),
                 Token::None,
+                Token::Str("banner"),
+                Token::None,
                 Token::Str("communication_disabled_until"),
                 Token::Some,
                 Token::Str("2022-01-01T09:00:00.000000+00:00"),

twilight-model/src/guild/member.rs

@@ -66,7 +66,7 @@ mod tests {
         let value = Member {
             avatar: Some(image_hash::AVATAR),
             avatar_decoration_data: None,
-            banner: None,
+            banner: Some(image_hash::BANNER),
             communication_disabled_until: None,
             deaf: false,
             flags,
@@ -104,11 +104,14 @@ mod tests {
             &[
                 Token::Struct {
                     name: "Member",
-                    len: 11,
+                    len: 12,
                 },
                 Token::Str("avatar"),
                 Token::Some,
                 Token::Str(image_hash::AVATAR_INPUT),
+                Token::Str("banner"),
+                Token::Some,
+                Token::Str(image_hash::BANNER_INPUT),
                 Token::Str("communication_disabled_until"),
                 Token::None,
                 Token::Str("deaf"),
@@ -177,7 +180,7 @@ mod tests {
         let value = Member {
             avatar: Some(image_hash::AVATAR),
             avatar_decoration_data: None,
-            banner: None,
+            banner: Some(image_hash::BANNER),
             communication_disabled_until: Some(communication_disabled_until),
             deaf: false,
             flags,
@@ -215,11 +218,14 @@ mod tests {
             &[
                 Token::Struct {
                     name: "Member",
-                    len: 11,
+                    len: 12,
                 },
                 Token::Str("avatar"),
                 Token::Some,
                 Token::Str(image_hash::AVATAR_INPUT),
+                Token::Str("banner"),
+                Token::Some,
+                Token::Str(image_hash::BANNER_INPUT),
                 Token::Str("communication_disabled_until"),
                 Token::Some,
                 Token::Str("2021-12-23T14:29:19.046000+00:00"),

twilight-model/src/guild/partial_member.rs

@@ -15,6 +15,7 @@ pub struct PartialMember {
     pub avatar: Option<ImageHash>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub avatar_decoration_data: Option<AvatarDecorationData>,
+    /// Member's guild banner.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub banner: Option<ImageHash>,
     pub communication_disabled_until: Option<Timestamp>,