Merge branch 'master' into autocomplete

Author: CodeWithSwastik

.gitignore

@@ -15,3 +15,5 @@ docs/crowdin.py
 *.flac
 *.mo
 .idea/
+.vs/slnx.sqlite
+env/

CONTRIBUTING.md

@@ -0,0 +1,45 @@
+# Contributing to Pycord
+We're really happy to accept contributions. However we also ask that you follow several rules when doing so.
+
+# Proper base
+When opening a PR, please make sure your branch targets the latest release branch, in this case it would be `master`. Also make sure your branch is even with the target branch, to avoid unnecessary surprises.
+
+# Versioning
+We follow [SemVer](https://semver.org/) versioning when it comes to pushing stable releases. Ideally, this means you should only be creating PRs for `patch` and `minor` changes. If you wish to introduce a `major` (breaking) change, please discuss it beforehand so we can determine how to integrate it into our next major version. If this involves removing a public facing property/method, mark it with obsolete instead on the latest release branch.
+
+# Proper titles
+When opening issues, make sure the title reflects the purpose of the issue or the pull request. Prefer past tense, and
+be brief. Further description belongs inside the issue or PR.
+
+# Descriptive changes
+We require the commits describe the change made. It can be a short description. If you fixed or resolved an open issue,
+please reference it by using the # notation.
+
+Examples of good commit messages:
+
+* `Fixed a potential memory leak with cache entities. Fixes #142.`
+* `Implemented new command extension. Resolves #169.`
+* `Changed message cache behaviour. It's now global instead of per-channel.`
+* `Fixed a potential NRE.`
+* ```
+  Changed message cache behaviour:
+
+  - Messages are now stored globally.
+  - Cache now deletes messages when they are deleted from discord.
+  - Cache itself is now a ring buffer.
+  ```
+
+# Code changes
+One of our requirements is that all code change commits must build successfully. This is verified by our CI.  You can view its summary by visiting it from the checks section on
+the PR overview page.
+
+PRs that do not build will not be accepted.
+
+Furthermore we require that methods you implement on Discord entities have a reflection in the Discord API.
+
+In the event your code change is a style change, doc change, or otherwise does not change how the code works, tag
+the commit with `[ci skip]`.
+
+# Non-code changes
+In the event you change something outside of code (i.e. a meta-change or documentation), you must tag your commit with
+`[ci skip]`.

DEVELOPER_CERTIFICATE_OF_ORIGIN.md

@@ -0,0 +1,36 @@
+# Developer Certificate of Origin (DCO) 
+```
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```

README.ja.rst

@@ -1,24 +1,28 @@
 pycord
 ==========
 
-.. image:: https://discord.com/api/guilds/681882711945641997/embed.png
-   :target: https://discord.gg/dK2qkEJ37N
+.. image:: https://discord.com/api/guilds/881207955029110855/embed.png
+   :target: https://pycord.dev/discord
    :alt: Discordサーバーの招待
 .. image:: https://img.shields.io/pypi/v/py-cord.svg
    :target: https://pypi.python.org/pypi/py-cord
    :alt: PyPIのバージョン情報
 .. image:: https://img.shields.io/pypi/pyversions/py-cord.svg
    :target: https://pypi.python.org/pypi/py-cord
    :alt: PyPIのサポートしているPythonのバージョン
+.. image:: https://img.shields.io/pypi/dm/py-cord?color=blue
+   :target: https://pypi.python.org/pypi/py-cord
+   :alt: PyPIダウンロード
 
-discord.pyのフォーク。 PyCordはPythonで記述されたDiscord用の最新の使いやすい機能豊富な非同期対応APIラッパーです。
+discord.pyのフォークです。PyCordはPythonで書かれたDiscordのモダンで使いやすく、豊富な機能を持ち、非同期に対応したAPIラッパーです。
 
 主な特徴
 -------------
 
 - ``async`` と ``await`` を使ったモダンなPythonらしいAPI。
 - 適切なレート制限の処理。
-- 速度とメモリの両方で最適化されています。
+- 速度とメモリ使用量の両方が最適化されています。
+- スラッシュコマンド、コンテキストメニュー、メッセージコンポーネントをサポート。
 
 インストール
 ----------
@@ -59,7 +63,7 @@ discord.pyのフォーク。 PyCordはPythonで記述されたDiscord用の最
 
 * `PyNaCl <https://pypi.org/project/PyNaCl/>`__ (音声サポート用)
 
-Linuxで音声サポートを導入するには、前述のコマンドを実行する前にお気に入りのパッケージマネージャー(例えば ``apt`` や ``dnf`` など)を使って以下のパッケージをインストールする必要があります:
+なお、Linuxで音声サポートをインストールする場合は、上記のコマンドを実行する前に、お好みのパッケージマネージャー（apt、dnfなど）を使って以下のパッケージをインストールしておく必要があります。
 
 * libffi-dev (システムによっては ``libffi-devel``)
 * python-dev (例えばPython 3.6用の ``python3.6-dev``)
@@ -102,11 +106,14 @@ Botの例
 
     bot.run('token')
 
-examplesディレクトリに更に多くのサンプルがあります。
+その他の例は、examples ディレクトリにあります。
+
+注意： ボットトークンを誰にも見せないようにしてください。
 
 リンク
 ------
 
-- `ドキュメント <https://pycord.readthedocs.io/en/latest/index.html>`_
-- `公式Discordサーバー <https://discord.gg/dK2qkEJ37N>`_
+- `ドキュメント <https://docs.pycord.dev/en/master/index.html>`_
+- `公式Discordサーバー <https://pycord.dev/discord>`_
+- `Discord開発者 <https://discord.gg/discord-developers>`_
 - `Discord API <https://discord.gg/discord-api>`_

README.rst

@@ -2,7 +2,7 @@ pycord
 ==========
 
 .. image:: https://discord.com/api/guilds/881207955029110855/embed.png
-   :target: https://discord.gg/dK2qkEJ37N
+   :target: https://pycord.dev/discord
    :alt: Discord server invite
 .. image:: https://img.shields.io/pypi/v/py-cord.svg
    :target: https://pypi.python.org/pypi/py-cord
@@ -21,7 +21,7 @@ Key Features
 
 - Modern Pythonic API using ``async`` and ``await``.
 - Proper rate limit handling.
-- Optimised in both speed and memory.
+- Optimised for both speed and memory usage.
 - Supports Slash Commands, Context Menus and Message Components.
 
 Installing
@@ -64,7 +64,7 @@ Optional Packages
 
 * `PyNaCl <https://pypi.org/project/PyNaCl/>`__ (for voice support)
 
-Please note that on Linux installing voice you must install the following packages via your favourite package manager (e.g. ``apt``, ``dnf``, etc) before running the above commands:
+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)
@@ -107,10 +107,12 @@ Normal Commands Example
 
 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://pycord.readthedocs.io/en/latest/index.html>`_
-- `Official Discord Server <https://discord.gg/dK2qkEJ37N>`_
+- `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>`_

SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.0.0   | :white_check_mark: |
+| 1.7.x   | :white_check_mark: |
+| < 1.7.3 | :x:                |
+
+## Reporting a Vulnerability
+
+If you find a vulnerability you have two ways to report it:
+- Write us on https://pycord.dev/discord
+- Open an [issue](https://github.com/Pycord-Development/pycord/issues/new/choose)

discord/cog.py

@@ -591,10 +591,12 @@ def remove_cog(self, name: str) -> Optional[Cog]:
         cog = self.__cogs.pop(name, None)
         if cog is None:
             return
+        
+        if hasattr(self, "_help_command"):
+            help_command = self._help_command
+            if help_command and help_command.cog is cog:
+                help_command.cog = None
 
-        help_command = self._help_command
-        if help_command and help_command.cog is cog:
-            help_command.cog = None
         cog._eject(self)
 
         return cog

discord/commands/commands.py

@@ -421,6 +421,7 @@ def _parse_options(self, params) -> List[Option]:
 
             if option.name is None:
                 option.name = p_name
+            option._parameter_name = p_name
 
             final_options.append(option)
 
@@ -479,11 +480,11 @@ async def _invoke(self, ctx: ApplicationContext) -> None:
             elif op.input_type == SlashCommandOptionType.string and op._converter is not None:
                 arg = await op._converter.convert(ctx, arg)
 
-            kwargs[op.name] = arg
+            kwargs[op._parameter_name] = arg
 
         for o in self.options:
-            if o.name not in kwargs:
-                kwargs[o.name] = o.default
+            if o._parameter_name not in kwargs:
+                kwargs[o._parameter_name] = o.default
 
         if self.cog is not None:
             await self.callback(self.cog, ctx, **kwargs)

discord/enums.py

@@ -649,7 +649,7 @@ def from_datatype(cls, datatype):
         if issubclass(datatype, float):
             return cls.number
 
-        if datatype.__name__ == "Member":
+        if datatype.__name__ in ["Member", "User"]:
             return cls.user
         if datatype.__name__ in [
             "GuildChannel", "TextChannel",
@@ -667,22 +667,40 @@ def from_datatype(cls, datatype):
 
 
 class EmbeddedActivity(Enum):
+    awkword = 879863881349087252
     betrayal = 773336526917861400
-    chess    = 832012586023256104
-    chess_dev = 832012774040141894
+    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
+    chess_in_the_park = 832012774040141894
+    decoders_dev = 891001866073296967
     doodle_crew = 878067389634314250
-    fishing  = 814288819477020702
+    doodle_crew_dev = 878067427668275241
+    fishington = 814288819477020702
     letter_tile = 879863686565621790
-    poker    = 755827207812677713
+    pn_staging = 763116274876022855
+    poker_night = 755827207812677713
+    poker_qa = 801133024841957428
+    putts = 832012854282158180
+    sketchy_artist = 879864070101172255
+    sketchy_artist_dev = 879864104980979792
     spell_cast = 852509694341283871
     watch_together = 880218394199220334
     watch_together_dev = 880218832743055411
-    word_snack = 879863976006127627
-    youtube  = 755600276941176913
+    word_snacks = 879863976006127627
+    word_snacks_dev = 879864010126786570
+    youtube_together = 755600276941176913 
 
 T = TypeVar('T')
 
-
 def create_unknown_value(cls: Type[T], val: Any) -> T:
     value_cls = cls._enum_value_cls_  # type: ignore
     name = f'unknown_{val}'

discord/ext/commands/help.py

@@ -559,7 +559,9 @@ async def filter_commands(self, commands, *, sort=False, key=None):
         if sort and key is None:
             key = lambda c: c.name
 
-        iterator = commands if self.show_hidden else filter(lambda c: not c.hidden, commands)
+        # Ignore Application Commands cause they dont have hidden/docs
+        prefix_commands = [command for command in commands if not isinstance(command, discord.commands.ApplicationCommand)]
+        iterator = prefix_commands if self.show_hidden else filter(lambda c: not c.hidden, prefix_commands)
 
         if self.verify_checks is False:
             # if we do not need to verify the checks then we can just