[dpy2_unstable] Updates the Red-Lavalink dependency

docs/cog_customcom.rst

@@ -19,27 +19,27 @@ Cooldowns
 
 You can set cooldowns for your custom commands. If a command is on cooldown, it will not be triggered.
 
-You can set cooldowns per member or per channel, or set a cooldown guild-wide. You can also set multiple types of cooldown on a single custom command. All cooldowns must pass before the command will trigger.
+You can set cooldowns per member or per thread/channel, or set a cooldown guild-wide. You can also set multiple types of cooldown on a single custom command. All cooldowns must pass before the command will trigger.
 
 ------------------
 Context Parameters
 ------------------
 
 You can enhance your custom command's response by leaving spaces for the bot to substitute.
 
-+-----------+----------------------------------------+
-| Argument  | Substitute                             |
-+===========+========================================+
-| {message} | The message the bot is responding to.  |
-+-----------+----------------------------------------+
-| {author}  | The user who called the command.       |
-+-----------+----------------------------------------+
-| {channel} | The channel the command was called in. |
-+-----------+----------------------------------------+
-| {server}  | The server the command was called in.  |
-+-----------+----------------------------------------+
-| {guild}   | Same as with {server}.                 |
-+-----------+----------------------------------------+
++-----------+--------------------------------------------------+
+| Argument  | Substitute                                       |
++===========+==================================================+
+| {message} | The message the bot is responding to.            |
++-----------+--------------------------------------------------+
+| {author}  | The user who called the command.                 |
++-----------+--------------------------------------------------+
+| {channel} | The channel or thread the command was called in. |
++-----------+--------------------------------------------------+
+| {server}  | The server the command was called in.            |
++-----------+--------------------------------------------------+
+| {guild}   | Same as with {server}.                           |
++-----------+--------------------------------------------------+
 
 You can further refine the response with dot notation. For example, {author.mention} will mention the user who called the command.
 
@@ -81,7 +81,7 @@ Showing your own avatar
 
 .. code-block:: none
 
-    [p]customcom add simple avatar {author.avatar_url}
+    [p]customcom add simple avatar {author.display_avatar}
     [p]avatar
         https://cdn.discordapp.com/avatars/133801473317404673/be4c4a4fe47cb3e74c31a0504e7a295e.webp?size=1024
 

docs/cog_guides/admin.rst

@@ -389,16 +389,16 @@ announceset channel
 
 .. code-block:: none
 
-    [p]announceset channel [channel]
+    [p]announceset channel <channel>
 
 **Description**
 
 Sets the channel where the bot owner announcements will be sent.
 
 **Arguments**
 
-* ``[channel]``: The channel that will be used for bot announcements.
-  |channel-input| Defaults to where you typed the command.
+* ``<channel>``: The channel that will be used for bot announcements.
+  |channel-input|
 
 .. _admin-command-announceset-clearchannel:
 

docs/cog_guides/core.rst

@@ -1842,9 +1842,9 @@ ignore channel
 
 **Description**
 
-Ignore commands in the channel or category.
+Ignore commands in the channel, thread, or category.
 
-Defaults to the current channel.
+Defaults to the current thread or channel.
 
 .. Note:: Owners, Admins, and those with Manage Channel permissions override ignored channels.
 
@@ -1856,7 +1856,7 @@ Defaults to the current channel.
     - ``[p]ignore channel 356236713347252226`` - Also accepts IDs.
 
 **Arguments:**
-    - ``<channel>`` - The channel to ignore. Can be a category channel.
+    - ``<channel>`` - The channel to ignore. This can also be a thread or category channel.
 
 .. _core-command-ignore-list:
 
@@ -4045,9 +4045,9 @@ unignore channel
 
 **Description**
 
-Remove a channel or category from the ignore list.
+Remove a channel, thread, or category from the ignore list.
 
-Defaults to the current channel.
+Defaults to the current thread or channel.
 
 **Examples:**
     - ``[p]unignore channel #general`` - Unignores commands in the #general channel.
@@ -4056,7 +4056,7 @@ Defaults to the current channel.
     - ``[p]unignore channel 356236713347252226`` - Also accepts IDs. Use this method to unignore categories.
 
 **Arguments:**
-    - ``<channel>`` - The channel to unignore. This can be a category channel.
+    - ``<channel>`` - The channel to unignore. This can also be a thread or category channel.
 
 .. _core-command-unignore-server:
 

docs/cog_guides/customcommands.rst

@@ -68,7 +68,7 @@ customcom cooldown
 
 Set, edit, or view the cooldown for a custom command.
 
-You may set cooldowns per member, channel, or guild. Multiple
+You may set cooldowns per member, thread/channel, or guild. Multiple
 cooldowns may be set. All cooldowns must be cooled to call the
 custom command.
 

docs/cog_guides/mod.rst

@@ -574,14 +574,14 @@ slowmode
 
 **Description**
 
-Changes channel's slowmode setting.
+Changes thread's or channel's slowmode setting.
 
 Interval can be anything from 0 seconds to 6 hours.
 Use without parameters to disable.
 
 **Arguments**
 
-* ``[interval=0:00:00]``: The time for the channel's slowmode settings.
+* ``[interval=0:00:00]``: The time for the thread's/channel's slowmode settings.
 
 .. note::
     Interval can be anything from 0 seconds to 6 hours.

docs/cog_guides/mutes.rst

@@ -91,7 +91,7 @@ mutechannel
 
 **Description**
 
-Mute a user in the current text channel.
+Mute a user in the current text channel (or in the parent of the current thread).
 
 Examples:
 
@@ -355,7 +355,7 @@ unmutechannel
 
 **Description**
 
-Unmute a user in this channel.
+Unmute a user in this channel (or in the parent of this thread).
 
 **Arguments**
 

docs/cog_guides/permissions.rst

@@ -29,7 +29,7 @@ Global rules (set by the owner) are checked first, then rules set for servers. I
 
 1. Rules about a user.
 2. Rules about the voice channel a user is in.
-3. Rules about the text channel a command was issued in.
+3. Rules about the text channel or a parent of the thread a command was issued in.
 4. Rules about a role the user has (The highest role they have with a rule will be used).
 5. Rules about the server a user is in (Global rules only).
 

docs/cog_guides/reports.rst

@@ -73,7 +73,7 @@ report interact
 
 Open a message tunnel.
 
-This tunnel will forward things you say in this channel
+This tunnel will forward things you say in this channel or thread
 to the ticket opener's direct messages.
 
 Tunnels do not persist across bot restarts.

docs/cog_permissions.rst

@@ -32,7 +32,7 @@ For each of those, the first rule pertaining to one of the following models will
 
 1. User
 2. Voice channel
-3. Text channel
+3. Text channel (parent text channel in case of invocations in threads)
 4. Channel category
 5. Roles, highest to lowest
 6. Server (can only be in global rules)

docs/framework_config.rst

@@ -161,7 +161,7 @@ Here is an example of the :code:`async with` syntax:
     * :py:meth:`Config.member` which takes :py:class:`discord.Member`.
     * :py:meth:`Config.user` which takes :py:class:`discord.User`.
     * :py:meth:`Config.role` which takes :py:class:`discord.Role`.
-    * :py:meth:`Config.channel` which takes :py:class:`discord.TextChannel`.
+    * :py:meth:`Config.channel` which takes :py:class:`discord.abc.GuildChannel` or :py:class:`discord.Thread`.
 
 If you need to wipe data from the config, you want to look at :py:meth:`Group.clear`, or :py:meth:`Config.clear_all`
 and similar methods, such as :py:meth:`Config.clear_all_guilds`.

redbot/__main__.py

@@ -381,10 +381,11 @@ async def run_bot(red: Red, cli_flags: Namespace) -> None:
             sys.exit(1)
 
     if cli_flags.dry_run:
+        # DEP-WARN
         await red.http.close()
         sys.exit(0)
     try:
-        await red.start(token, bot=True)
+        await red.start(token)
     except discord.LoginFailure:
         log.critical("This token doesn't seem to be valid.")
         db_token = await red._config.token()

redbot/cogs/admin/admin.py

@@ -356,14 +356,8 @@ async def announceset(self, ctx):
         pass
 
     @announceset.command(name="channel")
-    async def announceset_channel(self, ctx, *, channel: discord.TextChannel = None):
-        """
-        Change the channel where the bot will send announcements.
-
-        If channel is left blank it defaults to the current channel.
-        """
-        if channel is None:
-            channel = ctx.channel
+    async def announceset_channel(self, ctx, *, channel: discord.TextChannel):
+        """Change the channel where the bot will send announcements."""
         await self.config.guild(ctx.guild).announce_channel.set(channel.id)
         await ctx.send(
             _("The announcement channel has been set to {channel.mention}").format(channel=channel)

redbot/cogs/alias/alias_entry.py

@@ -2,7 +2,7 @@
 from re import findall
 
 import discord
-from discord.ext.commands.view import StringView
+from discord.ext.commands.view import StringView  # DEP-WARN
 from redbot.core import commands, Config
 from redbot.core.i18n import Translator
 from redbot.core.utils import AsyncIter

redbot/cogs/audio/core/abc.py

@@ -178,7 +178,7 @@ async def command_search(self, ctx: commands.Context, *, query: str):
     async def is_query_allowed(
         self,
         config: Config,
-        ctx_or_channel: Optional[Union[Context, discord.TextChannel]],
+        ctx_or_channel: Optional[Union[Context, discord.TextChannel, discord.Thread]],
         query: str,
         query_obj: Query,
     ) -> bool:
@@ -232,7 +232,7 @@ async def send_embed_msg(
         raise NotImplementedError()
 
     @abstractmethod
-    def _has_notify_perms(self, channel: discord.TextChannel) -> bool:
+    def _has_notify_perms(self, channel: Union[discord.TextChannel, discord.Thread]) -> bool:
         raise NotImplementedError()
 
     @abstractmethod

redbot/cogs/audio/core/cog_utils.py

@@ -18,6 +18,7 @@
 
 LazyGreedyConverter = get_lazy_converter("--")
 PlaylistConverter = get_playlist_converter()
+# DEP-WARN
 HUMANIZED_PERM = {
     "create_instant_invite": "Create Instant Invite",
     "kick_members": "Kick Members",
@@ -50,6 +51,16 @@
     "manage_roles": "Manage Roles",
     "manage_webhooks": "Manage Webhooks",
     "manage_emojis": "Manage Emojis",
+    "use_slash_commands": "Use Slash Commands",
+    "request_to_speak": "Request to Speak",
+    "manage_events": "Manage Events",
+    "manage_threads": "Manage Threads",
+    "create_public_threads": "Create Public Threads",
+    "create_private_threads": "Create Private Threads",
+    "external_stickers": "Use External Stickers",
+    "send_messages_in_threads": "Send Messages in Threads",
+    "start_embedded_activities": "Start Activities",
+    "moderate_members": "Moderate Member",
 }
 
 

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

@@ -207,7 +207,7 @@ async def on_red_audio_track_auto_play(
 
         if notify_channel and has_perms and not player.fetch("autoplay_notified", False):
             if (
-                len(player.manager.players) < 10
+                len(player.node.players) < 10
                 or not player._last_resume
                 and player._last_resume + datetime.timedelta(seconds=60)
                 > datetime.datetime.now(tz=datetime.timezone.utc)

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

@@ -145,7 +145,7 @@ async def cog_command_error(self, ctx: commands.Context, error: Exception) -> No
             )
             if error.send_cmd_help:
                 await ctx.send_help()
-        elif isinstance(error, commands.ConversionFailure):
+        elif isinstance(error, commands.BadArgument):
             handled = True
             if error.args:
                 if match := RE_CONVERSION.search(error.args[0]):

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

@@ -8,7 +8,6 @@
 import discord
 import lavalink
 from discord.backoff import ExponentialBackoff
-from discord.gateway import DiscordWebSocket
 
 from redbot.core.i18n import Translator, set_contextual_locales_from_guild
 from ...errors import DatabaseError, TrackEnqueueError
@@ -307,14 +306,13 @@ async def _websocket_closed_handler(
         disconnect: bool,
     ) -> None:
         guild_id = guild.id
+        shard = self.bot.shards[guild.shard_id]
         event_channel_id = extra.get("channelID")
         try:
             if not self._ws_resume[guild_id].is_set():
                 await self._ws_resume[guild_id].wait()
             else:
                 self._ws_resume[guild_id].clear()
-            node = player.node
-            voice_ws: DiscordWebSocket = node.get_voice_ws(guild_id)
             code = extra.get("code")
             by_remote = extra.get("byRemote", "")
             reason = extra.get("reason", "No Specified Reason").strip()
@@ -353,7 +351,7 @@ async def _websocket_closed_handler(
                 self._ws_op_codes[guild_id]._init(self._ws_op_codes[guild_id]._maxsize)
                 return
 
-            if voice_ws.socket._closing or voice_ws.socket.closed or not voice_ws.open:
+            if shard.is_closed():
                 if player._con_delay:
                     delay = player._con_delay.delay()
                 else:
@@ -365,21 +363,17 @@ async def _websocket_closed_handler(
                     "Socket Closed %s.  "
                     "Code: %d -- Remote: %s -- %s, %r",
                     guild_id,
-                    voice_ws.socket._closing or voice_ws.socket.closed,
+                    shard.is_closed(),
                     code,
                     by_remote,
                     reason,
                     player,
                 )
                 ws_audio_log.debug(
-                    "Reconnecting to channel %d in guild: %d | %.2fs",
-                    channel_id,
-                    guild_id,
-                    delay,
+                    "Reconnecting to channel %d in guild: %d | %.2fs", channel_id, guild_id, delay
                 )
                 await asyncio.sleep(delay)
-                while voice_ws.socket._closing or voice_ws.socket.closed or not voice_ws.open:
-                    voice_ws = node.get_voice_ws(guild_id)
+                while shard.is_closed():
                     await asyncio.sleep(0.1)
 
                 if has_perm and player.current and player.is_playing:

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

@@ -100,7 +100,7 @@ async def send_embed_msg(
                 embed.set_author(name=name)
         return await ctx.send(embed=embed)
 
-    def _has_notify_perms(self, channel: discord.TextChannel) -> bool:
+    def _has_notify_perms(self, channel: Union[discord.TextChannel, discord.Thread]) -> bool:
         perms = channel.permissions_for(channel.guild.me)
         return all((perms.send_messages, perms.embed_links))
 

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

@@ -60,7 +60,7 @@ def can_join_and_speak(self, channel: discord.VoiceChannel) -> bool:
     async def is_query_allowed(
         self,
         config: Config,
-        ctx_or_channel: Optional[Union[Context, discord.TextChannel]],
+        ctx_or_channel: Optional[Union[Context, discord.TextChannel, discord.Thread]],
         query: str,
         query_obj: Query,
     ) -> bool: