Merge branch 'master' into master

Author: Apocryphon-X

.gitignore

@@ -2,8 +2,8 @@
 *.py[cod]
 *.log
 *.egg-info
-venv
-.venv
+venv/
+.venv/
 docs/_build
 docs/crowdin.py
 *.buildinfo
@@ -15,5 +15,9 @@ docs/crowdin.py
 *.flac
 *.mo
 .idea/
+.DS_Store
+.python-version
+__pycache__
 .vs/slnx.sqlite
 env/
+build/

README.rst

@@ -1,5 +1,5 @@
 pycord
-==========
+======
 
 .. image:: https://discord.com/api/guilds/881207955029110855/embed.png
    :target: https://pycord.dev/discord
@@ -17,7 +17,7 @@ pycord
 A fork of discord.py. PyCord is a modern, easy to use, feature-rich, and async ready API wrapper for Discord written in Python.
 
 Key Features
--------------
+------------
 
 - Modern Pythonic API using ``async`` and ``await``.
 - Proper rate limit handling.
@@ -49,6 +49,15 @@ Otherwise to get voice support you should run the following command:
     # Windows
     py -3 -m pip install -U py-cord[voice]
 
+To install additional packages for speedup, run the following command:
+
+.. code:: sh
+
+    # Linux/macOS
+    python3 -m pip install -U "py-cord[speed]"
+    # Windows
+    py -3 -m pip install -U py-cord[speed]
+
 
 To install the development version, do the following:
 
@@ -60,17 +69,19 @@ To install the development version, do the following:
 
 
 Optional Packages
-~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~
 
 * `PyNaCl <https://pypi.org/project/PyNaCl/>`__ (for voice support)
+* `aiodns <https://pypi.org/project/aiodns/>`__, `Brotli <https://pypi.org/project/Brotli/>`__, `cchardet <https://pypi.org/project/cchardet/>`__ (for aiohttp speedup)
+* `orjson <https://pypi.org/project/orjson/>`__ (for json speedup)
 
 Please note that while installing voice support on Linux, you must install the following packages via your preferred package manager (e.g. ``apt``, ``dnf``, etc) BEFORE running the above commands:
 
 * libffi-dev (or ``libffi-devel`` on some systems)
 * python-dev (e.g. ``python3.6-dev`` for Python 3.6)
 
 Quick Example
---------------
+-------------
 
 .. code:: py
 
@@ -89,8 +100,8 @@ Quick Example
         
     bot.run("token")
 
-Normal Commands Example
-~~~~~~~~~~~~~
+Traditional Commands Example
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code:: py
 
@@ -110,9 +121,9 @@ You can find more examples in the examples directory.
 Note: Make sure you do not reveal your bot token to anyone, it can grant access to your bot.
 
 Links
-------
+-----
 
 - `Documentation <https://docs.pycord.dev/en/master/index.html>`_
-- `Official Discord Server <https://pycord.dev/discord>`_
-- `Discord Developers <https://discord.gg/discord-developers>`_
-- `Discord API <https://discord.gg/discord-api>`_
+- `Our Official Discord Server <https://pycord.dev/discord>`_
+- `Official Discord Developers Server <https://discord.gg/discord-developers>`_
+- `Unofficial Discord API Server <https://discord.gg/discord-api>`_

discord/commands/commands.py

@@ -26,21 +26,22 @@
 from __future__ import annotations
 
 import asyncio
-import types
 import functools
 import inspect
+import re
+import types
 from collections import OrderedDict
 from typing import Any, Callable, Dict, List, Optional, Union, TYPE_CHECKING
 
+from .context import ApplicationContext, AutocompleteContext
+from .errors import ApplicationCommandError, CheckFailure, ApplicationCommandInvokeError
+from .permissions import Permission
 from ..enums import SlashCommandOptionType, ChannelType
+from ..errors import ValidationError, ClientException
 from ..member import Member
-from ..user import User
 from ..message import Message
-from .context import ApplicationContext, AutocompleteContext
+from ..user import User
 from ..utils import find, get_or_fetch, async_all
-from ..errors import ValidationError, ClientException
-from .errors import ApplicationCommandError, CheckFailure, ApplicationCommandInvokeError
-from .permissions import Permission
 
 __all__ = (
     "_BaseCommand",
@@ -390,7 +391,7 @@ def __init__(self, func: Callable, *args, **kwargs) -> None:
         self.cog = None
 
         params = self._get_signature_parameters()
-        self.options: List[Option] = self._parse_options(params)
+        self.options: List[Option] = kwargs.get('options') or self._parse_options(params)
 
         try:
             checks = func.__commands_checks__
@@ -459,6 +460,9 @@ def _parse_options(self, params) -> List[Option]:
                 option.name = p_name
             option._parameter_name = p_name
 
+            validate_chat_input_name(option.name)
+            validate_chat_input_description(option.description)
+
             final_options.append(option)
 
         return final_options
@@ -645,7 +649,7 @@ def __init__(
             minmax_types = (int, float, type(None))
         else:
             minmax_types = (type(None),)
-        minmax_typehint = Optional[Union[minmax_types]] # type: ignore
+        minmax_typehint = Optional[Union[minmax_types]]  # type: ignore
 
         self.min_value: minmax_typehint = kwargs.pop("min_value", None)
         self.max_value: minmax_typehint = kwargs.pop("max_value", None)
@@ -1128,24 +1132,33 @@ def command(**kwargs):
     """
     return application_command(**kwargs)
 
+
+docs = "https://discord.com/developers/docs"
+
+
 # Validation
 def validate_chat_input_name(name: Any):
+    # Must meet the regex ^[\w-]{1,32}$
     if not isinstance(name, str):
-        raise TypeError("Name of a command must be a string.")
-    if " " in name:
-        raise ValidationError("Name of a chat input command cannot have spaces.")
-    if not name.islower():
-        raise ValidationError("Name of a chat input command must be lowercase.")
-    if len(name) > 32 or len(name) < 1:
+        raise TypeError(f"Chat input command names and options must be of type str. Received {name}")
+    if not re.match(r"^[\w-]{1,32}$", name):
+        raise ValidationError(
+            r'Chat input command names and options must follow the regex "^[\w-]{1,32}$". For more information, see '
+            f"{docs}/interactions/application-commands#application-command-object-application-command-naming. Received "
+            f"{name}"
+        )
+    if not 1 <= len(name) <= 32:
         raise ValidationError(
-            "Name of a chat input command must be less than 32 characters and non empty."
+            f"Chat input command names and options must be 1-32 characters long. Received {name}"
         )
+    if not name.lower() == name:  # Can't use islower() as it fails if none of the chars can be lower. See #512.
+        raise ValidationError(f"Chat input command names and options must be lowercase. Received {name}")
 
 
 def validate_chat_input_description(description: Any):
     if not isinstance(description, str):
-        raise TypeError("Description of a command must be a string.")
-    if len(description) > 100 or len(description) < 1:
+        raise TypeError(f"Command description must be of type str. Received {description}")
+    if not 1 <= len(description) <= 100:
         raise ValidationError(
-            "Description of a chat input command must be less than 100 characters and non empty."
+            f"Command description must be 1-100 characters long. Received {description}"
         )

discord/commands/context.py

@@ -109,6 +109,9 @@ def author(self) -> Optional[Union[Member, User]]:
 
     @property
     def voice_client(self):
+        if self.guild is None:
+            return None
+        
         return self.guild.voice_client
 
     @cached_property

discord/enums.py

@@ -669,26 +669,26 @@ def from_datatype(cls, datatype):
 class EmbeddedActivity(Enum):
     awkword = 879863881349087252
     betrayal = 773336526917861400
-    cg2_qa = 832012815819604009
-    cg2_staging = 832012730599735326
-    cg3_dev = 832012682520428625
-    cg3_prod = 832013003968348200
-    cg3_qa = 832012894068801636
-    cg3_staging = 832012938398400562
-    cg4_dev = 832013108234289153
-    cg4_prod = 832025144389533716
-    cg4_qa = 832025114077298718
-    cg4_staging = 832025061657280566
-    chess_in_the_park_dev = 832012586023256104
+    checkers_in_the_park = 832013003968348200
+    checkers_in_the_park_dev = 832012682520428625
+    checkers_in_the_park_staging = 832012938398400562
+    checkers_in_the_park_qa = 832012894068801636
     chess_in_the_park = 832012774040141894
+    chess_in_the_park_dev = 832012586023256104
+    chest_in_the_park_staging = 832012730599735326
+    chest_in_the_park_qa = 832012815819604009
     decoders_dev = 891001866073296967
     doodle_crew = 878067389634314250
     doodle_crew_dev = 878067427668275241
     fishington = 814288819477020702
     letter_tile = 879863686565621790
-    pn_staging = 763116274876022855
+    ocho = 832025144389533716
+    ocho_dev = 832013108234289153
+    ocho_staging = 832025061657280566
+    ocho_qa = 832025114077298718
     poker_night = 755827207812677713
-    poker_qa = 801133024841957428
+    poker_night_staging = 763116274876022855
+    poker_night_qa = 801133024841957428
     putts = 832012854282158180
     sketchy_artist = 879864070101172255
     sketchy_artist_dev = 879864104980979792

discord/ext/commands/bot.py

@@ -922,22 +922,6 @@ async def on_message(self, message):
         await self.process_commands(message)
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class Bot(BotBase, discord.Bot):
     """Represents a discord bot.
 

discord/ext/tasks/__init__.py

@@ -565,11 +565,13 @@ def _get_next_sleep_time(self) -> datetime.datetime:
 
         if self._current_loop == 0:
             self._time_index += 1
-            return datetime.datetime.combine(datetime.datetime.now(datetime.timezone.utc), next_time)
+            if next_time > datetime.datetime.now(datetime.timezone.utc).timetz():
+                return datetime.datetime.combine(datetime.datetime.now(datetime.timezone.utc), next_time)
+            else:
+                return datetime.datetime.combine(datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=1), next_time)
 
-        next_date = self._last_iteration
-        if self._time_index == 0:
-            # we can assume that the earliest time should be scheduled for "tomorrow"
+        next_date = cast(datetime.datetime, self._last_iteration)
+        if next_time < next_date.timetz():
             next_date += datetime.timedelta(days=1)
 
         self._time_index += 1

discord/flags.py

@@ -376,11 +376,6 @@ def bug_hunter(self):
         """:class:`bool`: Returns ``True`` if the user is a Bug Hunter"""
         return UserFlags.bug_hunter.value
 
-    @flag_value
-    def mfa_sms(self):
-        """:class:`bool`: Returns ``True`` if the user has SMS recovery for 2FA enabled"""
-        return UserFlags.mfa_sms.value
-
     @flag_value
     def premium_promo_dismissed(self):
         """:class:`bool`: Returns ``True`` if the user is marked as dismissed Nitro promotion"""
@@ -411,11 +406,6 @@ def team_user(self):
         """:class:`bool`: Returns ``True`` if the user is a Team User."""
         return UserFlags.team_user.value
 
-    @flag_value
-    def partner_or_verification_application(self):
-        """:class:`bool`: Relates to partner/verification applications."""
-        return UserFlags.partner_or_verification_application.value
-
     @flag_value
     def system(self):
         """:class:`bool`: Returns ``True`` if the user is a system user (i.e. represents Discord officially)."""
@@ -426,16 +416,6 @@ def bug_hunter_level_2(self):
         """:class:`bool`: Returns ``True`` if the user is a Bug Hunter Level 2"""
         return UserFlags.bug_hunter_level_2.value
 
-    @flag_value
-    def has_unread_urgent_messages(self):
-        """:class:`bool`: Returns ``True`` if the user has a unread urgent messages."""
-        return UserFlags.has_unread_urgent_messages.value
-
-    @flag_value
-    def underage_deleted(self):
-        """:class:`bool`: Returns ``True`` if the user has a pending deletion for being underage in DOB prompt"""
-        return UserFlags.underage_deleted.value
-
     @flag_value
     def verified_bot(self):
         """:class:`bool`: Returns ``True`` if the user is a Verified Bot."""
@@ -470,14 +450,6 @@ def bot_http_interactions(self):
         """
         return UserFlags.bot_http_interactions.value
 
-    @flag_value
-    def spammer(self):
-        """:class:`bool`: Returns ``True`` if the user is disabled for being a spammer.
-
-        .. versionadded:: 2.0
-        """
-        return UserFlags.spammer.value
-
     def all(self) -> List[UserFlags]:
         """List[:class:`UserFlags`]: Returns all public flags the user has."""
         return [public_flag for public_flag in UserFlags if self._has_flag(public_flag.value)]

discord/guild.py

@@ -3025,7 +3025,7 @@ async def edit_welcome_screen(
         self,
         *,
         description: Optional[str] = ...,
-        welcome_channels: Optional[List[WelcomeChannel]] = ...,
+        welcome_channels: Optional[List[WelcomeScreenChannel]] = ...,
         enabled: Optional[bool] = ...,
     ) -> WelcomeScreen:
         ...

discord/http.py

@@ -85,6 +85,7 @@
         threads,
         voice,
         sticker,
+        welcome_screen,
     )
     from .types.snowflake import Snowflake, SnowflakeList
     from .types.message import Attachment