discord.py 2.0 update (3d914e08->2.0.1) (#5709)

redbot/cogs/audio/core/abc.py

@@ -196,7 +196,9 @@ class MixinMeta(ABC):
     async def is_query_allowed(
         self,
         config: Config,
-        ctx_or_channel: Optional[Union[Context, discord.TextChannel, discord.Thread]],
+        ctx_or_channel: Optional[
+            Union[Context, discord.TextChannel, discord.VoiceChannel, discord.Thread]
+        ],
         query: str,
         query_obj: Query,
     ) -> bool:
@@ -250,7 +252,9 @@ class MixinMeta(ABC):
         raise NotImplementedError()
 
     @abstractmethod
-    def _has_notify_perms(self, channel: Union[discord.TextChannel, discord.Thread]) -> bool:
+    def _has_notify_perms(
+        self, channel: Union[discord.TextChannel, discord.VoiceChannel, discord.Thread]
+    ) -> bool:
         raise NotImplementedError()
 
     @abstractmethod

redbot/cogs/audio/core/commands/controller.py

@@ -657,7 +657,7 @@ class PlayerControllerCommands(MixinMeta, metaclass=CompositeMetaClass):
             if not self._player_check(ctx):
                 player = await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
                 player.store("notify_channel", ctx.channel.id)
             else:
@@ -675,7 +675,7 @@ class PlayerControllerCommands(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 await player.move_to(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             await ctx.tick()
         except AttributeError:

redbot/cogs/audio/core/commands/player.py

@@ -85,7 +85,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             except AttributeError:
                 return await self.send_embed_msg(
@@ -193,7 +193,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             except AttributeError:
                 return await self.send_embed_msg(
@@ -456,7 +456,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             except AttributeError:
                 return await self.send_embed_msg(
@@ -572,7 +572,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             except AttributeError:
                 return await self.send_embed_msg(
@@ -697,7 +697,7 @@ class PlayerCommands(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             except AttributeError:
                 return await self.send_embed_msg(

redbot/cogs/audio/core/commands/queue.py

@@ -344,7 +344,7 @@ class QueueCommands(MixinMeta, metaclass=CompositeMetaClass):
                 )
             player = await lavalink.connect(
                 ctx.author.voice.channel,
-                deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
             )
             player.store("notify_channel", ctx.channel.id)
         except AttributeError:

redbot/cogs/audio/core/events/dpy.py

@@ -62,7 +62,7 @@ HUMANIZED_PERM = {
     "manage_roles": _("Manage Roles"),
     "manage_webhooks": _("Manage Webhooks"),
     "manage_emojis": _("Manage Emojis"),
-    "use_slash_commands": _("Use Slash Commands"),
+    "use_application_commands": _("Use Application Commands"),
     "request_to_speak": _("Request to Speak"),
     "manage_events": _("Manage Events"),
     "manage_threads": _("Manage Threads"),
@@ -187,7 +187,7 @@ class DpyEvents(MixinMeta, metaclass=CompositeMetaClass):
             )
 
         surpass_ignore = (
-            isinstance(ctx.channel, discord.abc.PrivateChannel)
+            ctx.guild is None
             or await ctx.bot.is_owner(ctx.author)
             or await ctx.bot.is_admin(ctx.author)
         )
@@ -210,7 +210,7 @@ class DpyEvents(MixinMeta, metaclass=CompositeMetaClass):
                 )
                 raise CheckFailure(message=text)
 
-        current_perms = ctx.channel.permissions_for(ctx.me)
+        current_perms = ctx.bot_permissions
         if guild and not current_perms.is_superset(self.permission_cache):
             current_perms_set = set(iter(current_perms))
             expected_perms_set = set(iter(self.permission_cache))

redbot/cogs/audio/core/events/lavalink.py

@@ -90,7 +90,11 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
                     self._ws_resume[guild_id].set()
 
                 await self._websocket_closed_handler(
-                    guild=guild, player=player, extra=extra, deafen=deafen, disconnect=disconnect
+                    guild=guild,
+                    player=player,
+                    extra=extra,
+                    self_deaf=deafen,
+                    disconnect=disconnect,
                 )
             except Exception as exc:
                 log.debug(
@@ -335,7 +339,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
         guild: discord.Guild,
         player: lavalink.Player,
         extra: Dict,
-        deafen: bool,
+        self_deaf: bool,
         disconnect: bool,
     ) -> None:
         guild_id = guild.id
@@ -415,7 +419,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
 
                 if has_perm and player.current and player.is_playing:
                     player.store("resumes", player.fetch("resumes", 0) + 1)
-                    await player.connect(deafen=deafen)
+                    await player.connect(self_deaf=self_deaf)
                     await player.resume(player.current, start=player.position, replace=True)
                     ws_audio_log.info(
                         "Voice websocket reconnected Reason: Error code %s & Currently playing",
@@ -429,7 +433,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 elif has_perm and player.paused and player.current:
                     player.store("resumes", player.fetch("resumes", 0) + 1)
-                    await player.connect(deafen=deafen)
+                    await player.connect(self_deaf=self_deaf)
                     await player.resume(
                         player.current, start=player.position, replace=True, pause=True
                     )
@@ -445,7 +449,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 elif has_perm and (not disconnect) and (not player.is_playing):
                     player.store("resumes", player.fetch("resumes", 0) + 1)
-                    await player.connect(deafen=deafen)
+                    await player.connect(self_deaf=self_deaf)
                     ws_audio_log.info(
                         "Voice websocket reconnected "
                         "Reason: Error code %s & Not playing, but auto disconnect disabled",
@@ -497,7 +501,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
                     ).currently_auto_playing_in.set([])
             elif code in (42069,) and has_perm and player.current and player.is_playing:
                 player.store("resumes", player.fetch("resumes", 0) + 1)
-                await player.connect(deafen=deafen)
+                await player.connect(self_deaf=self_deaf)
                 await player.resume(player.current, start=player.position, replace=True)
                 ws_audio_log.info("Player resumed - Reason: Error code %s & %s", code, reason)
                 ws_audio_log.debug(
@@ -514,7 +518,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
                 )
                 await asyncio.sleep(delay)
                 if has_perm and player.current and player.is_playing:
-                    await player.connect(deafen=deafen)
+                    await player.connect(self_deaf=self_deaf)
                     await player.resume(player.current, start=player.position, replace=True)
                     ws_audio_log.info(
                         "Voice websocket reconnected Reason: Error code %s & Player is active",
@@ -528,7 +532,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 elif has_perm and player.paused and player.current:
                     player.store("resumes", player.fetch("resumes", 0) + 1)
-                    await player.connect(deafen=deafen)
+                    await player.connect(self_deaf=self_deaf)
                     await player.resume(
                         player.current, start=player.position, replace=True, pause=True
                     )
@@ -544,7 +548,7 @@ class LavalinkEvents(MixinMeta, metaclass=CompositeMetaClass):
                     )
                 elif has_perm and (not disconnect) and (not player.is_playing):
                     player.store("resumes", player.fetch("resumes", 0) + 1)
-                    await player.connect(deafen=deafen)
+                    await player.connect(self_deaf=self_deaf)
                     ws_audio_log.info(
                         "Voice websocket reconnected "
                         "to channel %s in guild: %s | "

redbot/cogs/audio/core/tasks/startup.py

@@ -138,7 +138,7 @@ class StartUpTasks(MixinMeta, metaclass=CompositeMetaClass):
                             if not (perms.connect and perms.speak):
                                 vc = None
                                 break
-                            player = await lavalink.connect(vc, deafen=auto_deafen)
+                            player = await lavalink.connect(vc, self_deaf=auto_deafen)
                             player.store("notify_channel", notify_channel_id)
                             break
                         except NodeNotFound:
@@ -222,7 +222,7 @@ class StartUpTasks(MixinMeta, metaclass=CompositeMetaClass):
                         if not (perms.connect and perms.speak):
                             vc = None
                             break
-                        player = await lavalink.connect(vc, deafen=auto_deafen)
+                        player = await lavalink.connect(vc, self_deaf=auto_deafen)
                         player.store("notify_channel", notify_channel_id)
                         break
                     except NodeNotFound:

redbot/cogs/audio/core/utilities/formatting.py

@@ -100,7 +100,7 @@ class FormattingUtilities(MixinMeta, metaclass=CompositeMetaClass):
             try:
                 await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             except AttributeError:
                 return await self.send_embed_msg(ctx, title=_("Connect to a voice channel first."))

redbot/cogs/audio/core/utilities/miscellaneous.py

@@ -99,7 +99,9 @@ class MiscellaneousUtilities(MixinMeta, metaclass=CompositeMetaClass):
                 embed.set_author(name=name)
         return await ctx.send(embed=embed)
 
-    def _has_notify_perms(self, channel: Union[discord.TextChannel, discord.Thread]) -> bool:
+    def _has_notify_perms(
+        self, channel: Union[discord.TextChannel, discord.VoiceChannel, discord.Thread]
+    ) -> bool:
         perms = channel.permissions_for(channel.guild.me)
         return all((can_user_send_messages_in(channel.guild.me, channel), perms.embed_links))
 

redbot/cogs/audio/core/utilities/player.py

@@ -114,8 +114,7 @@ class PlayerUtilities(MixinMeta, metaclass=CompositeMetaClass):
         dj_role = self._dj_role_cache.setdefault(
             ctx.guild.id, await self.config.guild(ctx.guild).dj_role()
         )
-        dj_role_obj = ctx.guild.get_role(dj_role)
-        return dj_role_obj in ctx.guild.get_member(member.id).roles
+        return member.get_role(dj_role) is not None
 
     async def is_requester(self, ctx: commands.Context, member: discord.Member) -> bool:
         try:
@@ -711,7 +710,7 @@ class PlayerUtilities(MixinMeta, metaclass=CompositeMetaClass):
             ):
                 await player.move_to(
                     user_channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
                 return True
         else:

redbot/cogs/audio/core/utilities/playlists.py

@@ -545,7 +545,7 @@ class PlaylistUtilities(MixinMeta, metaclass=CompositeMetaClass):
                     return False
                 await lavalink.connect(
                     ctx.author.voice.channel,
-                    deafen=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
+                    self_deaf=await self.config.guild_from_id(ctx.guild.id).auto_deafen(),
                 )
             except NodeNotFound:
                 await self.send_embed_msg(

redbot/cogs/audio/core/utilities/validation.py

@@ -60,7 +60,9 @@ class ValidationUtilities(MixinMeta, metaclass=CompositeMetaClass):
     async def is_query_allowed(
         self,
         config: Config,
-        ctx_or_channel: Optional[Union[Context, discord.TextChannel, discord.Thread]],
+        ctx_or_channel: Optional[
+            Union[Context, discord.TextChannel, discord.VoiceChannel, discord.Thread]
+        ],
         query: str,
         query_obj: Query,
     ) -> bool: