Rename user_permissions_in and add member_permissions_guild_level (#3116)

`user_permissions_in` was renamed because it was an outlier, the previously
removed `member_permissions` has come back under a new name.

Author: jamesbt365

src/model/channel/guild_channel.rs

@@ -406,7 +406,7 @@ impl GuildChannel {
                 .members
                 .iter()
                 .filter(|member| {
-                    guild.user_permissions_in(self, member).contains(Permissions::VIEW_CHANNEL)
+                    guild.member_permissions_in(self, member).contains(Permissions::VIEW_CHANNEL)
                 })
                 .cloned()
                 .collect::<Vec<Member>>()),

src/model/channel/message.rs

@@ -217,7 +217,7 @@ impl Message {
         let mut permissions = if let Some(member) = &self.member {
             guild.partial_member_permissions_in(channel, self.author.id, member)
         } else {
-            guild.user_permissions_in(channel, guild.members.get(&self.author.id)?)
+            guild.member_permissions_in(channel, guild.members.get(&self.author.id)?)
         };
 
         if is_thread {

src/model/guild/member.rs

@@ -175,7 +175,7 @@ impl Member {
 
         for channel in &guild.channels {
             if channel.kind != ChannelType::Category
-                && guild.user_permissions_in(channel, member).view_channel()
+                && guild.member_permissions_in(channel, member).view_channel()
             {
                 return Some(channel.clone());
             }

src/model/guild/mod.rs

@@ -270,7 +270,7 @@ impl Guild {
         let member = self.members.get(&uid)?;
         self.channels.iter().find(|&channel| {
             channel.kind != ChannelType::Category
-                && self.user_permissions_in(channel, member).view_channel()
+                && self.member_permissions_in(channel, member).view_channel()
         })
     }
 
@@ -285,7 +285,7 @@ impl Guild {
                 && self
                     .members
                     .iter()
-                    .map(|member| self.user_permissions_in(channel, member))
+                    .map(|member| self.member_permissions_in(channel, member))
                     .all(Permissions::view_channel)
         })
     }
@@ -804,8 +804,8 @@ impl Guild {
 
     /// Calculate a [`Member`]'s permissions in a given channel in the guild.
     #[must_use]
-    pub fn user_permissions_in(&self, channel: &GuildChannel, member: &Member) -> Permissions {
-        Self::user_permissions_in_(
+    pub fn member_permissions_in(&self, channel: &GuildChannel, member: &Member) -> Permissions {
+        Self::member_permissions_in_(
             channel,
             member.user.id,
             &member.roles,
@@ -831,7 +831,7 @@ impl Guild {
             assert_eq!(user.id, member_id, "User::id does not match provided PartialMember");
         }
 
-        Self::user_permissions_in_(
+        Self::member_permissions_in_(
             channel,
             member_id,
             &member.roles,
@@ -841,8 +841,84 @@ impl Guild {
         )
     }
 
+    /// Calculate a [`Member`]'s permissions in the guild.
+    ///
+    /// **Note**: This method calculates the permissions granted to the member across the entire
+    /// guild, excluding any channel-specific overrides. If you are not checking permissions that
+    /// do not apply on the channel level, like `Permissions::BAN_MEMBERS`, use
+    /// member_permissions_in instead.
+    #[must_use]
+    pub fn member_permissions_guild_level(&self, member: &Member) -> Permissions {
+        Self::member_permissions_guild_level_(
+            member.user.id,
+            &member.roles,
+            self.id,
+            self.owner_id,
+            &self.roles,
+        )
+    }
+
+    /// Calculate a [`PartialMember`]'s permissions in the guild.
+    ///
+    /// See `Self::member_permissions_guild_level` for note on usage.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the passed [`UserId`] does not match the [`PartialMember`] id, if user is Some.
+    #[must_use]
+    pub fn partial_member_permissions_guild_level(
+        &self,
+        member_id: UserId,
+        member: &PartialMember,
+    ) -> Permissions {
+        if let Some(user) = &member.user {
+            assert_eq!(user.id, member_id, "User::id does not match provided PartialMember");
+        }
+
+        Self::member_permissions_guild_level_(
+            member_id,
+            &member.roles,
+            self.id,
+            self.owner_id,
+            &self.roles,
+        )
+    }
+
+    /// Helper function that can also be used from [`PartialGuild`].
+    pub(crate) fn member_permissions_guild_level_(
+        user_id: UserId,
+        member_roles: &[RoleId],
+        guild_id: GuildId,
+        guild_owner_id: UserId,
+        guild_roles: &ExtractMap<RoleId, Role>,
+    ) -> Permissions {
+        if user_id == guild_owner_id {
+            return Permissions::all();
+        }
+
+        //// Get @everyone permissions first.
+        let mut permissions = if let Some(role) = guild_roles.get(&RoleId::new(guild_id.get())) {
+            role.permissions
+        } else {
+            error!("@everyone role missing in {}", guild_id);
+            Permissions::empty()
+        };
+
+        for role_id in member_roles {
+            if let Some(role) = guild_roles.get(role_id) {
+                permissions |= role.permissions;
+            }
+        }
+
+        if permissions.contains(Permissions::ADMINISTRATOR) {
+            return Permissions::all();
+        }
+
+        permissions
+    }
+
     /// Helper function that can also be used from [`PartialGuild`].
-    pub(crate) fn user_permissions_in_(
+    pub(crate) fn member_permissions_in_(
         channel: &GuildChannel,
         member_user_id: UserId,
         member_roles: &[RoleId],

src/model/guild/partial_guild.rs

@@ -225,7 +225,7 @@ impl PartialGuild {
             assert_eq!(user.id, member_id, "User::id does not match provided PartialMember");
         }
 
-        Guild::user_permissions_in_(
+        Guild::member_permissions_in_(
             channel,
             member_id,
             &member.roles,
@@ -235,6 +235,46 @@ impl PartialGuild {
         )
     }
 
+    /// Calculate a [`Member`]'s permissions in the guild.
+    ///
+    /// See `Guild::member_permissions_guild_level` for note on usage.
+    #[must_use]
+    pub fn member_permissions_guild_level(&self, member: &Member) -> Permissions {
+        Guild::member_permissions_guild_level_(
+            member.user.id,
+            &member.roles,
+            self.id,
+            self.owner_id,
+            &self.roles,
+        )
+    }
+
+    /// Calculate a [`PartialMember`]'s permissions in the guild.
+    ///
+    /// See `Guild::member_permissions_guild_level` for note on usage.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the passed [`UserId`] does not match the [`PartialMember`] id, if user is Some.
+    #[must_use]
+    pub fn partial_member_permissions_guild_level(
+        &self,
+        member_id: UserId,
+        member: &PartialMember,
+    ) -> Permissions {
+        if let Some(user) = &member.user {
+            assert_eq!(user.id, member_id, "User::id does not match provided PartialMember");
+        }
+
+        Guild::member_permissions_guild_level_(
+            member_id,
+            &member.roles,
+            self.id,
+            self.owner_id,
+            &self.roles,
+        )
+    }
+
     /// Returns a formatted URL of the guild's icon, if the guild has an icon.
     #[must_use]
     pub fn icon_url(&self) -> Option<String> {
@@ -249,8 +289,8 @@ impl PartialGuild {
 
     /// Calculate a [`Member`]'s permissions in a given channel in the guild.
     #[must_use]
-    pub fn user_permissions_in(&self, channel: &GuildChannel, member: &Member) -> Permissions {
-        Guild::user_permissions_in_(
+    pub fn member_permissions_in(&self, channel: &GuildChannel, member: &Member) -> Permissions {
+        Guild::member_permissions_in_(
             channel,
             member.user.id,
             &member.roles,