Add banner field to Member and PartialMember (#3368)

Author: TapGhoul

src/cache/event.rs

@@ -205,6 +205,7 @@ impl CacheUpdate for GuildMemberUpdateEvent {
                 member.deaf.clone_from(&self.deaf);
                 member.mute.clone_from(&self.mute);
                 member.avatar.clone_from(&self.avatar);
+                member.banner.clone_from(&self.banner);
                 member.communication_disabled_until.clone_from(&self.communication_disabled_until);
                 member.unusual_dm_activity_until.clone_from(&self.unusual_dm_activity_until);
 
@@ -226,6 +227,7 @@ impl CacheUpdate for GuildMemberUpdateEvent {
                     premium_since: self.premium_since,
                     permissions: None,
                     avatar: self.avatar,
+                    banner: self.banner,
                     communication_disabled_until: self.communication_disabled_until,
                     flags: GuildMemberFlags::default(),
                     unusual_dm_activity_until: self.unusual_dm_activity_until,
@@ -460,6 +462,7 @@ impl CacheUpdate for PresenceUpdateEvent {
                         premium_since: None,
                         permissions: None,
                         avatar: None,
+                        banner: None,
                         communication_disabled_until: None,
                         flags: GuildMemberFlags::default(),
                         unusual_dm_activity_until: None,

src/model/event.rs

@@ -260,6 +260,7 @@ pub struct GuildMemberUpdateEvent {
     #[serde(default)]
     pub mute: bool,
     pub avatar: Option<ImageHash>,
+    pub banner: Option<ImageHash>,
     pub communication_disabled_until: Option<Timestamp>,
     pub unusual_dm_activity_until: Option<Timestamp>,
 }

src/model/guild/member.rs

@@ -12,7 +12,7 @@ use crate::http::{CacheHttp, Http};
 use crate::internal::prelude::*;
 use crate::model::prelude::*;
 #[cfg(feature = "model")]
-use crate::model::utils::avatar_url;
+use crate::model::utils::{avatar_url, user_banner_url};
 
 /// Information about a member of a guild.
 ///
@@ -28,8 +28,10 @@ pub struct Member {
     ///
     /// Can't be longer than 32 characters.
     pub nick: Option<String>,
-    /// The guild avatar hash
+    /// The member's guild avatar hash
     pub avatar: Option<ImageHash>,
+    /// The member's guild banner hash
+    pub banner: Option<ImageHash>,
     /// Vector of Ids of [`Role`]s given to the member.
     pub roles: Vec<RoleId>,
     /// Timestamp representing the date when the member joined.
@@ -530,6 +532,14 @@ impl Member {
         avatar_url(Some(self.guild_id), self.user.id, self.avatar.as_ref())
     }
 
+    /// Returns the formatted URL of the member's per guild banner, if one exists.
+    ///
+    /// This will produce a WEBP image URL, or GIF if the member has a GIF avatar.
+    #[must_use]
+    pub fn banner_url(&self) -> Option<String> {
+        user_banner_url(Some(self.guild_id), self.user.id, self.banner.as_ref())
+    }
+
     /// Retrieves the URL to the current member's avatar, falling back to the user's avatar, then
     /// default avatar if needed.
     ///
@@ -609,8 +619,10 @@ pub struct PartialMember {
     ///
     /// Will be None or a time in the past if the user is not flagged.
     pub unusual_dm_activity_until: Option<Timestamp>,
-    /// The guild avatar hash
+    /// The member's guild avatar hash
     pub avatar: Option<ImageHash>,
+    /// The member's guild banner hash
+    pub banner: Option<ImageHash>,
 }
 
 impl From<PartialMember> for Member {
@@ -619,6 +631,7 @@ impl From<PartialMember> for Member {
             user: partial.user.unwrap_or_default(),
             nick: partial.nick,
             avatar: partial.avatar,
+            banner: partial.banner,
             roles: partial.roles,
             joined_at: partial.joined_at,
             premium_since: partial.premium_since,
@@ -649,6 +662,7 @@ impl From<Member> for PartialMember {
             permissions: member.permissions,
             unusual_dm_activity_until: member.unusual_dm_activity_until,
             avatar: member.avatar,
+            banner: member.banner,
         }
     }
 }

src/model/user.rs

@@ -24,7 +24,7 @@ use crate::internal::prelude::*;
 #[cfg(feature = "model")]
 use crate::json::json;
 #[cfg(feature = "model")]
-use crate::model::utils::avatar_url;
+use crate::model::utils::{avatar_url, user_banner_url};
 
 /// Used with `#[serde(with|deserialize_with|serialize_with)]`
 ///
@@ -385,13 +385,10 @@ impl User {
     /// Returns the formatted URL of the user's banner, if one exists.
     ///
     /// This will produce a WEBP image URL, or GIF if the user has a GIF banner.
-    ///
-    /// **Note**: This will only be present if the user is fetched via Rest API, e.g. with
-    /// [`crate::http::Http::get_user`].
     #[inline]
     #[must_use]
     pub fn banner_url(&self) -> Option<String> {
-        banner_url(self.id, self.banner.as_ref())
+        user_banner_url(None, self.id, self.banner.as_ref())
     }
 
     /// Creates a direct message channel between the [current user] and the user. This can also
@@ -813,14 +810,6 @@ fn static_avatar_url(user_id: UserId, hash: Option<&ImageHash>) -> Option<String
     hash.map(|hash| cdn!("/avatars/{}/{}.webp?size=1024", user_id, hash))
 }
 
-#[cfg(feature = "model")]
-fn banner_url(user_id: UserId, hash: Option<&ImageHash>) -> Option<String> {
-    hash.map(|hash| {
-        let ext = if hash.is_animated() { "gif" } else { "webp" };
-        cdn!("/banners/{}/{}.{}?size=1024", user_id, hash, ext)
-    })
-}
-
 #[cfg(feature = "model")]
 fn tag(name: &str, discriminator: Option<NonZeroU16>) -> String {
     // 32: max length of username

src/model/utils.rs

@@ -36,6 +36,23 @@ pub(super) fn avatar_url(
     })
 }
 
+#[cfg(feature = "model")]
+pub(super) fn user_banner_url(
+    guild_id: Option<GuildId>,
+    user_id: UserId,
+    hash: Option<&ImageHash>,
+) -> Option<String> {
+    hash.map(|hash| {
+        let ext = if hash.is_animated() { "gif" } else { "webp" };
+
+        if let Some(guild_id) = guild_id {
+            cdn!("/guilds/{}/users/{}/banners/{}.{}?size=1024", guild_id, user_id, hash, ext)
+        } else {
+            cdn!("/banners/{}/{}.{}?size=1024", user_id, hash, ext)
+        }
+    })
+}
+
 #[cfg(feature = "model")]
 pub(super) fn icon_url(id: GuildId, icon: Option<&ImageHash>) -> Option<String> {
     icon.map(|icon| {