Remove uses of Roles.partners and rename constants

Author: jb3

bot/constants.py

@@ -143,7 +143,6 @@ class _Roles(EnvConfig, env_prefix="roles_"):
     archived_channels_access: int = 1074780483776417964
 
     contributors: int = 295488872404484098
-    partners: int = 323426753857191936
     python_community: int = 458226413825294336
     voice_verified: int = 764802720779337729
 
@@ -604,7 +603,7 @@ class _Keys(EnvConfig, env_prefix="api_keys_"):
 # Default role combinations
 MODERATION_ROLES = Guild.moderation_roles
 STAFF_ROLES = Guild.staff_roles
-STAFF_PARTNERS_COMMUNITY_ROLES = STAFF_ROLES + (Roles.partners, Roles.python_community)
+STAFF_AND_COMMUNITY_ROLES = STAFF_ROLES + (Roles.python_community,)
 
 # Channel combinations
 MODERATION_CHANNELS = Guild.moderation_channels

bot/exts/info/help.py

@@ -9,7 +9,7 @@
 from rapidfuzz.utils import default_process
 
 from bot import constants
-from bot.constants import Channels, STAFF_PARTNERS_COMMUNITY_ROLES
+from bot.constants import Channels, STAFF_AND_COMMUNITY_ROLES
 from bot.decorators import redirect_output
 from bot.log import get_logger
 from bot.pagination import LinePaginator
@@ -176,7 +176,7 @@ class CustomHelpCommand(HelpCommand):
     def __init__(self):
         super().__init__(command_attrs={"help": "Shows help for bot commands"})
 
-    @redirect_output(destination_channel=Channels.bot_commands, bypass_roles=STAFF_PARTNERS_COMMUNITY_ROLES)
+    @redirect_output(destination_channel=Channels.bot_commands, bypass_roles=STAFF_AND_COMMUNITY_ROLES)
     async def command_callback(self, ctx: Context, *, command: str | None = None) -> None:
         """Attempts to match the provided query with a valid command or cog."""
         # the only reason we need to tamper with this is because d.py does not support "categories",

bot/exts/info/information.py

@@ -117,7 +117,7 @@ async def get_extended_server_info(self, ctx: Context) -> str:
             {python_general.mention} cooldown: {python_general.slowmode_delay}s
         """)
 
-    @has_any_role(*constants.STAFF_PARTNERS_COMMUNITY_ROLES)
+    @has_any_role(*constants.STAFF_AND_COMMUNITY_ROLES)
     @command(name="roles")
     async def roles_info(self, ctx: Context) -> None:
         """Returns a list of all roles and their corresponding IDs."""
@@ -137,7 +137,7 @@ async def roles_info(self, ctx: Context) -> None:
 
         await LinePaginator.paginate(role_list, ctx, embed, empty=False)
 
-    @has_any_role(*constants.STAFF_PARTNERS_COMMUNITY_ROLES)
+    @has_any_role(*constants.STAFF_AND_COMMUNITY_ROLES)
     @command(name="role")
     async def role_info(self, ctx: Context, *roles: Role | str) -> None:
         """
@@ -258,7 +258,7 @@ async def user_info(self, ctx: Context, user_or_message: MemberOrUser | Message
             return
 
         # Will redirect to #bot-commands if it fails.
-        if in_whitelist_check(ctx, roles=constants.STAFF_PARTNERS_COMMUNITY_ROLES):
+        if in_whitelist_check(ctx, roles=constants.STAFF_AND_COMMUNITY_ROLES):
             embed = await self.create_user_embed(ctx, user, passed_as_message)
             await ctx.send(embed=embed)
 
@@ -562,9 +562,9 @@ def add_content(title: str, content: str) -> None:
 
         await ctx.send(message)
 
-    @cooldown_with_role_bypass(2, 60 * 3, BucketType.member, bypass_roles=constants.STAFF_PARTNERS_COMMUNITY_ROLES)
+    @cooldown_with_role_bypass(2, 60 * 3, BucketType.member, bypass_roles=constants.STAFF_AND_COMMUNITY_ROLES)
     @group(invoke_without_command=True)
-    @in_whitelist(channels=(constants.Channels.bot_commands,), roles=constants.STAFF_PARTNERS_COMMUNITY_ROLES)
+    @in_whitelist(channels=(constants.Channels.bot_commands,), roles=constants.STAFF_AND_COMMUNITY_ROLES)
     async def raw(self, ctx: Context, message: Message | None = None) -> None:
         """Shows information about the raw API response."""
         if message is None:

bot/exts/info/patreon.py

@@ -7,7 +7,7 @@
 
 from bot import constants
 from bot.bot import Bot
-from bot.constants import Channels, Guild, Roles, STAFF_PARTNERS_COMMUNITY_ROLES
+from bot.constants import Channels, Guild, Roles, STAFF_AND_COMMUNITY_ROLES
 from bot.decorators import in_whitelist
 from bot.log import get_logger
 
@@ -110,7 +110,7 @@ async def patreon_info(self, ctx: commands.Context) -> None:
         await ctx.send(embed=embed)
 
     @patreon_info.command("supporters", aliases=("patrons",))
-    @in_whitelist(channels=(Channels.bot_commands,), roles=STAFF_PARTNERS_COMMUNITY_ROLES)
+    @in_whitelist(channels=(Channels.bot_commands,), roles=STAFF_AND_COMMUNITY_ROLES)
     async def patreon_supporters(self, ctx: commands.Context) -> None:
         """Sends the current list of patreon supporters, sorted by tier level."""
         await self.send_current_supporters(ctx.channel)

bot/exts/info/subscribe.py

@@ -184,7 +184,7 @@ async def cog_load(self) -> None:
     @commands.command(name="subscribe", aliases=("unsubscribe",))
     @redirect_output(
         destination_channel=constants.Channels.bot_commands,
-        bypass_roles=constants.STAFF_PARTNERS_COMMUNITY_ROLES,
+        bypass_roles=constants.STAFF_AND_COMMUNITY_ROLES,
     )
     async def subscribe_command(self, ctx: commands.Context, *_) -> None:  # We don't actually care about the args
         """Display the member's current state for each role, and allow them to add/remove the roles."""

bot/exts/moderation/infraction/_utils.py

@@ -9,7 +9,7 @@
 from pydis_core.site_api import ResponseCodeError
 
 import bot
-from bot.constants import Categories, Channels, Colours, Icons, MODERATION_ROLES, STAFF_PARTNERS_COMMUNITY_ROLES
+from bot.constants import Categories, Channels, Colours, Icons, MODERATION_ROLES, STAFF_AND_COMMUNITY_ROLES
 from bot.converters import DurationOrExpiry, MemberOrUser
 from bot.errors import InvalidInfractedUserError
 from bot.exts.moderation.infraction._views import BanConfirmationView
@@ -332,11 +332,11 @@ async def confirm_elevated_user_ban(ctx: Context, user: MemberOrUser) -> bool:
     """
     If user has an elevated role, require confirmation before banning.
 
-    A member with the staff, partner, or community roles are considered elevated.
+    A member with the staff or community roles are considered elevated.
 
     Returns a boolean indicating whether the infraction should proceed.
     """
-    if not isinstance(user, Member) or not any(role.id in STAFF_PARTNERS_COMMUNITY_ROLES for role in user.roles):
+    if not isinstance(user, Member) or not any(role.id in STAFF_AND_COMMUNITY_ROLES for role in user.roles):
         return True
 
     confirmation_view = BanConfirmationView(

bot/exts/moderation/stream.py

@@ -16,7 +16,7 @@
     Guild,
     MODERATION_ROLES,
     Roles,
-    STAFF_PARTNERS_COMMUNITY_ROLES,
+    STAFF_AND_COMMUNITY_ROLES,
     VideoPermission,
 )
 from bot.converters import Expiry
@@ -199,17 +199,17 @@ async def revokestream(self, ctx: commands.Context, member: discord.Member) -> N
     @commands.command(aliases=("lstream",))
     @commands.has_any_role(*MODERATION_ROLES)
     async def liststream(self, ctx: commands.Context) -> None:
-        """Lists all users who aren't staff, partners or members of the python community and have stream permissions."""
-        non_staff_partners_community_members_with_stream = [
+        """Lists all users who aren't staff or members of the python community and have stream permissions."""
+        non_staff_or_community_members_with_stream = [
             member
             for member in ctx.guild.get_role(Roles.video).members
-            if not any(role.id in STAFF_PARTNERS_COMMUNITY_ROLES for role in member.roles)
+            if not any(role.id in STAFF_AND_COMMUNITY_ROLES for role in member.roles)
         ]
 
         # List of tuples (UtcPosixTimestamp, str)
         # So that the list can be sorted on the UtcPosixTimestamp before the message is passed to the paginator.
         streamer_info = []
-        for member in non_staff_partners_community_members_with_stream:
+        for member in non_staff_or_community_members_with_stream:
             if revoke_time := await self.task_cache.get(member.id):
                 # Member only has temporary streaming perms
                 revoke_delta = Arrow.utcfromtimestamp(revoke_time).humanize()

bot/exts/utils/ping.py

@@ -4,7 +4,7 @@
 from discord.ext import commands
 
 from bot.bot import Bot
-from bot.constants import Channels, STAFF_PARTNERS_COMMUNITY_ROLES, URLs
+from bot.constants import Channels, STAFF_AND_COMMUNITY_ROLES, URLs
 from bot.decorators import in_whitelist
 
 DESCRIPTIONS = (
@@ -22,7 +22,7 @@ def __init__(self, bot: Bot) -> None:
         self.bot = bot
 
     @commands.command()
-    @in_whitelist(channels=(Channels.bot_commands,), roles=STAFF_PARTNERS_COMMUNITY_ROLES)
+    @in_whitelist(channels=(Channels.bot_commands,), roles=STAFF_AND_COMMUNITY_ROLES)
     async def ping(self, ctx: commands.Context) -> None:
         """
         Gets different measures of latency within the bot.

bot/exts/utils/reminders.py

@@ -22,7 +22,7 @@
     NEGATIVE_REPLIES,
     POSITIVE_REPLIES,
     Roles,
-    STAFF_PARTNERS_COMMUNITY_ROLES,
+    STAFF_AND_COMMUNITY_ROLES,
 )
 from bot.converters import Duration, UnambiguousUser
 from bot.errors import LockedResourceError
@@ -288,7 +288,7 @@ async def _check_mentions(ctx: Context, mentions: t.Iterable[Mentionable]) -> tu
 
         If mentions aren't allowed, also return the type of mention(s) disallowed.
         """
-        if await has_no_roles_check(ctx, *STAFF_PARTNERS_COMMUNITY_ROLES):
+        if await has_no_roles_check(ctx, *STAFF_AND_COMMUNITY_ROLES):
             return False, "members/roles"
         if await has_no_roles_check(ctx, *MODERATION_ROLES):
             return all(isinstance(mention, discord.User | discord.Member) for mention in mentions), "roles"
@@ -455,9 +455,9 @@ async def new_reminder(
 
         For example, to set a reminder that expires in 3 days and 1 minute, you can do `!remind new 3d1M Do something`.
         """
-        # If the user is not staff, partner or part of the python community,
+        # If the user is not staff or part of the python community,
         # we need to verify whether or not to make a reminder at all.
-        if await has_no_roles_check(ctx, *STAFF_PARTNERS_COMMUNITY_ROLES):
+        if await has_no_roles_check(ctx, *STAFF_AND_COMMUNITY_ROLES):
 
             # If they don't have permission to set a reminder in this channel
             if ctx.channel.id not in WHITELISTED_CHANNELS:

bot/exts/utils/snekbox/_constants.py

@@ -14,7 +14,7 @@
 # The Snekbox commands' whitelists and blacklists.
 NO_SNEKBOX_CHANNELS = (Channels.python_general,)
 NO_SNEKBOX_CATEGORIES = ()
-SNEKBOX_ROLES = (Roles.helpers, Roles.moderators, Roles.admins, Roles.owners, Roles.python_community, Roles.partners)
+SNEKBOX_ROLES = (Roles.helpers, Roles.moderators, Roles.admins, Roles.owners, Roles.python_community)
 
 REDO_EMOJI = "\U0001f501"  # :repeat:
 REDO_TIMEOUT = 30