Merge pull request #61 from Pycord-Development/master

Sync slash with master

Author: CodeWithSwastik

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-## Contributing to discord.py
+## Contributing to Pycord
 
 First off, thanks for taking the time to contribute. It makes the library substantially better. :+1:
 
@@ -8,9 +8,9 @@ The following is a set of guidelines for contributing to the repository. These a
 
 Generally speaking questions are better suited in our resources below.
 
-- The official support server: https://discord.gg/r3sSKJJ
+- The official support server: https://discord.gg/UCXwPR7Pew
 - The Discord API server under #python_discord-py: https://discord.gg/discord-api
-- [The FAQ in the documentation](https://discordpy.readthedocs.io/en/latest/faq.html)
+- [The FAQ in the documentation](https://pycord.readthedocs.io/en/latest/faq.html)
 - [StackOverflow's `discord.py` tag](https://stackoverflow.com/questions/tagged/discord.py)
 
 Please try your best not to ask questions in our issue tracker. Most of them don't belong there unless they provide value to a larger audience.

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: Ask a question
     about: Ask questions and discuss with other users of the library.
-    url: https://github.com/Rapptz/discord.py/discussions
+    url: https://github.com/Pycord-Development/pycord/discussions
   - name: Discord Server
     about: Use our official Discord server to ask for help and questions as well.
-    url: https://discord.gg/r3sSKJJ
+    url: https://discord.gg/UCXwPR7Pew

README.ja.rst

@@ -1,64 +1,63 @@
-discord.py
+pycord
 ==========
 
-.. image:: https://discord.com/api/guilds/336642139381301249/embed.png
-   :target: https://discord.gg/nXzj3dg
+.. image:: https://discord.com/api/guilds/681882711945641997/embed.png
+   :target: https://discord.gg/dK2qkEJ37N
    :alt: Discordサーバーの招待
-.. image:: https://img.shields.io/pypi/v/discord.py.svg
-   :target: https://pypi.python.org/pypi/discord.py
+.. 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/discord.py.svg
-   :target: https://pypi.python.org/pypi/discord.py
+.. image:: https://img.shields.io/pypi/pyversions/py-cord.svg
+   :target: https://pypi.python.org/pypi/py-cord
    :alt: PyPIのサポートしているPythonのバージョン
 
-discord.py は機能豊富かつモダンで使いやすい、非同期処理にも対応したDiscord用のAPIラッパーです。
+discord.pyのフォーク。 PyCordはPythonで記述されたDiscord用の最新の使いやすい機能豊富な非同期対応APIラッパーです。
 
 主な特徴
 -------------
 
 - ``async`` と ``await`` を使ったモダンなPythonらしいAPI。
-- 適切なレート制限処理
-- メモリと速度の両方を最適化。
+- 適切なレート制限の処理。
+- 速度とメモリの両方で最適化されています。
 
 インストール
--------------
+----------
 
 **Python 3.8 以降のバージョンが必須です**
 
 完全な音声サポートなしでライブラリをインストールする場合は次のコマンドを実行してください:
 
 .. code:: sh
 
-    # Linux/OS X
-    python3 -m pip install -U discord.py
+    # Linux/macOS
+    python3 -m pip install -U py-cord
 
     # Windows
-    py -3 -m pip install -U discord.py
+    py -3 -m pip install -U py-cord
 
 音声サポートが必要なら、次のコマンドを実行しましょう:
 
 .. code:: sh
 
-    # Linux/OS X
-    python3 -m pip install -U discord.py[voice]
+    # Linux/macOS
+    python3 -m pip install -U "py-cord[voice]"
 
     # Windows
-    py -3 -m pip install -U discord.py[voice]
+    py -3 -m pip install -U py-cord[voice]
 
 
 開発版をインストールしたいのならば、次の手順に従ってください:
-
 .. code:: sh
 
-    $ git clone https://github.com/Rapptz/discord.py
-    $ cd discord.py
+    $ git clone https://github.com/Pycord-Development/pycord
+    $ cd pycord
     $ python3 -m pip install -U .[voice]
 
 
 オプションパッケージ
-~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
 
-* PyNaCl (音声サポート用)
+* `PyNaCl <https://pypi.org/project/PyNaCl/>`__ (音声サポート用)
 
 Linuxで音声サポートを導入するには、前述のコマンドを実行する前にお気に入りのパッケージマネージャー(例えば ``apt`` や ``dnf`` など)を使って以下のパッケージをインストールする必要があります:
 
@@ -108,6 +107,6 @@ examplesディレクトリに更に多くのサンプルがあります。
 リンク
 ------
 
-- `ドキュメント <https://discordpy.readthedocs.io/ja/latest/index.html>`_
-- `公式Discordサーバー <https://discord.gg/nXzj3dg>`_
+- `ドキュメント <https://pycord.readthedocs.io/en/latest/index.html>`_
+- `公式Discordサーバー <https://discord.gg/dK2qkEJ37N>`_
 - `Discord API <https://discord.gg/discord-api>`_

README.rst

@@ -1,14 +1,14 @@
 pycord
 ==========
 
-.. image:: https://discord.com/api/guilds/681882711945641997/embed.png
+.. image:: https://img.shields.io/discord/881207955029110855?color=5865f2&label=Discord&logo=discord
    :target: https://discord.gg/dK2qkEJ37N
    :alt: Discord server invite
 .. image:: https://img.shields.io/pypi/v/py-cord.svg
-   :target: https://pypi.python.org/pypi/py-cord.py
+   :target: https://pypi.python.org/pypi/py-cord
    :alt: PyPI version info
 .. image:: https://img.shields.io/pypi/pyversions/py-cord.svg
-   :target: https://pypi.python.org/pypi/py-cord.py
+   :target: https://pypi.python.org/pypi/py-cord
    :alt: PyPI supported Python versions
 
 A fork of discord.py. PyCord is a modern, easy to use, feature-rich, and async ready API wrapper for Discord written in Python.
@@ -50,7 +50,7 @@ To install the development version, do the following:
 
 .. code:: sh
 
-    $ git clone https://github.com/Pycord-Development/pycord.py
+    $ git clone https://github.com/Pycord-Development/pycord
     $ cd pycord
     $ python3 -m pip install -U .[voice]
 
@@ -70,38 +70,38 @@ Quick Example
 
 .. code:: py
 
-    import pycord
+    import discord
 
-    class MyClient(pycord.Client):
+    class MyClient(discord.Client):
         async def on_ready(self):
-            print('Logged on as', self.user)
+            print("Logged on as", self.user)
 
         async def on_message(self, message):
             # don't respond to ourselves
             if message.author == self.user:
                 return
 
-            if message.content == 'ping':
-                await message.channel.send('pong')
+            if message.content == "ping":
+                await message.channel.send("pong")
 
     client = MyClient()
-    client.run('token')
+    client.run("token")
 
 Bot Example
 ~~~~~~~~~~~~~
 
 .. code:: py
 
-    import pycord
-    from pycord.ext import commands
+    import discord
+    from discord.ext import commands
 
-    bot = pycord.Bot(command_prefix='>')
+    bot = commands.Bot(command_prefix=">")
 
     @bot.command()
     async def ping(ctx):
-        await ctx.send('pong')
+        await ctx.send("pong")
 
-    bot.run('token')
+    bot.run("token")
 
 You can find more examples in the examples directory.
 

about.md

@@ -0,0 +1,11 @@
+# About
+## What Happened to Discord.py?
+Rapptz, also known as Danny, the maintainer and core developer of discord.py will no longer be updating it. Here's his full explanation: https://gist.github.com/Rapptz/4a2f62751b9600a31a0d3c78100287f1 <br>
+[Here](https://gist.github.com/Rapptz/4a2f62751b9600a31a0d3c78100287f1#FAQ) is a FAQ written by him.
+
+## What is Pycord?
+Pycord ("py-cord" on PyPI) is a maintained fork of discord.py which will be updated with new changes to the API. Pycord was created by a group of developers that want to continue developing this Python module.
+
+## Features
+Pycord v1.7.3 is the same as discord.py v1.7.3. However Pycord v2.0.0 will support interactions and other features introduces in v2.0.0a as it's a fork of the master branch. <br>
+We also have a FAQ channel in our Discord server. You can [click here](https://discord.gg/nRMbjMnxCz) to join.

discord/__main__.py

@@ -36,11 +36,11 @@ def show_version():
 
     entries.append('- Python v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(sys.version_info))
     version_info = discord.version_info
-    entries.append('- discord.py v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(version_info))
+    entries.append('- pycord v{0.major}.{0.minor}.{0.micro}-{0.releaselevel}'.format(version_info))
     if version_info.releaselevel != 'final':
-        pkg = pkg_resources.get_distribution('discord.py')
+        pkg = pkg_resources.get_distribution('pycord')
         if pkg:
-            entries.append(f'    - discord.py pkg_resources: v{pkg.version}')
+            entries.append(f'    - pycord pkg_resources: v{pkg.version}')
 
     entries.append(f'- aiohttp v{aiohttp.__version__}')
     uname = platform.uname()

discord/app/commands.py

@@ -30,7 +30,6 @@
 from typing import Callable, Dict, List, Optional, Union
 
 from ..enums import SlashCommandOptionType
-from ..interactions import Interaction
 from ..member import Member
 from ..user import User
 from ..message import Message
@@ -138,12 +137,10 @@ def __eq__(self, other) -> bool:
             and other.description == self.description
         )
 
-    async def invoke(self, interaction) -> None:
+    async def invoke(self, ctx: InteractionContext) -> None:
         # TODO: Parse the args better, apply custom converters etc.
-        ctx = InteractionContext(interaction)
-
         kwargs = {}
-        for arg in interaction.data.get("options", []):
+        for arg in ctx.interaction.data.get("options", []):
             op = find(lambda x: x.name == arg["name"], self.options)
             arg = arg["value"]
 
@@ -257,11 +254,11 @@ def command_group(self, name, description) -> SubCommandGroup:
         self.subcommands.append(sub_command_group)
         return sub_command_group
 
-    async def invoke(self, interaction: Interaction) -> None:
-        option = interaction.data["options"][0]
+    async def invoke(self, ctx: InteractionContext) -> None:
+        option = ctx.interaction.data["options"][0]
         command = find(lambda x: x.name == option["name"], self.subcommands)
-        interaction.data = option
-        await command.invoke(interaction)
+        ctx.interaction.data = option
+        await command.invoke(ctx)
 
 
 class UserCommand(ApplicationCommand):
@@ -290,29 +287,28 @@ def __init__(self, func: Callable, *args, **kwargs) -> None:
     def to_dict(self) -> Dict[str, Union[str, int]]:
         return {"name": self.name, "description": self.description, "type": self.type}
 
-    async def invoke(self, interaction: Interaction) -> None:
-        if "members" not in interaction.data["resolved"]:
-            _data = interaction.data["resolved"]["users"]
+    async def invoke(self, ctx: InteractionContext) -> None:
+        if "members" not in ctx.interaction.data["resolved"]:
+            _data = ctx.interaction.data["resolved"]["users"]
             for i, v in _data.items():
                 v["id"] = int(i)
                 user = v
-            target = User(state=interaction._state, data=user)
+            target = User(state=ctx.interaction._state, data=user)
         else:
-            _data = interaction.data["resolved"]["members"]
+            _data = ctx.interaction.data["resolved"]["members"]
             for i, v in _data.items():
                 v["id"] = int(i)
                 member = v
-            _data = interaction.data["resolved"]["users"]
+            _data = ctx.interaction.data["resolved"]["users"]
             for i, v in _data.items():
                 v["id"] = int(i)
                 user = v
             member["user"] = user
             target = Member(
                 data=member,
-                guild=interaction._state._get_guild(interaction.guild_id),
-                state=interaction._state,
+                guild=ctx.interaction._state._get_guild(ctx.interaction.guild_id),
+                state=ctx.interaction._state,
             )
-        ctx = InteractionContext(interaction)
         await self.callback(ctx, target)
 
 
@@ -340,18 +336,17 @@ def __init__(self, func, *args, **kwargs):
     def to_dict(self):
         return {"name": self.name, "description": self.description, "type": self.type}
 
-    async def invoke(self, interaction):
-        _data = interaction.data["resolved"]["messages"]
+    async def invoke(self, ctx: InteractionContext):
+        _data = ctx.interaction.data["resolved"]["messages"]
         for i, v in _data.items():
             v["id"] = int(i)
             message = v
-        channel = interaction._state.get_channel(int(message["channel_id"]))
+        channel = ctx.interaction._state.get_channel(int(message["channel_id"]))
         if channel is None:
-            data = await interaction._state.http.start_private_message(
+            data = await ctx.interaction._state.http.start_private_message(
                 int(message["author"]["id"])
             )
-            channel = interaction._state.add_dm_channel(data)
+            channel = ctx.interaction._state.add_dm_channel(data)
 
-        target = Message(state=interaction._state, channel=channel, data=message)
-        ctx = InteractionContext(interaction)
+        target = Message(state=ctx.interaction._state, channel=channel, data=message)
         await self.callback(ctx, target)

discord/app/context.py

@@ -22,6 +22,11 @@
 DEALINGS IN THE SOFTWARE.
 """
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import discord
+
 from ..interactions import Interaction
 from ..utils import cached_property
 
@@ -35,7 +40,8 @@ class InteractionContext:
     .. versionadded:: 2.0
     """
 
-    def __init__(self, interaction: Interaction):
+    def __init__(self, bot: "discord.Bot", interaction: Interaction):
+        self.bot = bot
         self.interaction = interaction
 
     @cached_property