Merge branch 'master' of https://github.com/Pycord-Development/pycord …

…into permissions-v2

.github/CONTRIBUTING.md

@@ -46,7 +46,7 @@ By submitting a pull request, you agree that; 1) You hold the copyright on all s
 
 Not following this guideline could lead to your pull being squashed for a cleaner commit history
 
-Some style guides we would recommed using in your pulls:
+Some style guides we would recommend using in your pulls:
 
 The [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) style is a very widely used style and a good style to start with.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,6 @@
+# Warning: We have a feature freeze till release
+That means we won't accept new features for now. Only bug fixes.
+
 ## Summary
 
 <!-- What is this pull request for? Does it fix any issues? -->

.github/SECURITY.md

@@ -5,8 +5,7 @@
 | Version | Supported          |
 | ------- | ------------------ |
 | 2.0.0   | :white_check_mark: |
-| 1.7.x   | :white_check_mark: |
-| < 1.7.3 | :x:                |
+| <2.0.0  | :x:                |
 
 ## Reporting a Vulnerability
 

.github/workflows/bandit.yml

@@ -2,6 +2,7 @@ name: bandit
 on: [pull_request, push]
 jobs:
   bandit:
+    if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/codeql-analysis.yml

@@ -22,6 +22,7 @@ on:
 
 jobs:
   analyze:
+    if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     name: Analyze
     runs-on: ubuntu-latest
     permissions:

.github/workflows/codespell.yml

@@ -2,6 +2,7 @@ name: codespell
 on: [pull_request, push]
 jobs:
   codespell:
+    if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/docs.yml

@@ -0,0 +1,24 @@
+name: Docs
+
+on: [push, pull_request]
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ 3.8 ]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install -U pip
+        pip install -U sphinx sphinxcontrib-trio aiohttp sphinxcontrib-websupport myst-parser
+    - name: Compile to html
+      run: |
+        cd docs
+        make html

.github/workflows/mypy.yml

@@ -2,11 +2,12 @@ name: mypy
 on: [pull_request, push]
 jobs:
   mypy:
+    if: github.event.pull_request.user.type != 'Bot' && !contains(github.event.pull_request.labels.*.name, 'skip-ci')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
       - run: pip install mypy
       - run: pip install -r requirements.txt
       - run: mkdir --parents --verbose .mypy_cache
-      - run: mypy --ignore-missing-imports --install-types --non-interactive . || true
+      - run: mypy --ignore-missing-imports --install-types --non-interactive .

.gitignore

@@ -10,14 +10,24 @@ docs/crowdin.py
 *.mp3
 *.m4a
 *.wav
+*.mp4
+*.ogg
+*.pcm
 *.png
 *.jpg
 *.flac
 *.mo
 .idea/
+env/
+.vs/
 .DS_Store
 .python-version
 __pycache__
-.vs/slnx.sqlite
+.vs/*
+.vscode/*
 env/
 build/
+test.py
+build/
+node_modules/*
+test.py

.readthedocs.yml

@@ -10,7 +10,7 @@ sphinx:
   builder: html
 
 python:
-  version: 3.8
+  version: "3.8"
   install:
     - method: pip
       path: .

FUNDING.yml

@@ -0,0 +1 @@
+patreon: pycord

README.rst

@@ -23,14 +23,13 @@ Rapptz, also known as Danny, the maintainer and core developer of discord.py wil
 
 Pycord v1.7.3 is the same as discord.py v1.7.3, however, Pycord v2.0 will support newer features of the API such as slash commands, context menus, scheduled events, timeouts, and others.
 
-
 Key Features
 ------------
 
 - Modern Pythonic API using ``async`` and ``await``.
 - Proper rate limit handling.
 - Optimised for both speed and memory usage.
-- Supports Slash Commands, Context Menus and Message Components.
+- Full Application Command Support
 
 Installing
 ----------
@@ -80,13 +79,13 @@ 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)
+* `aiodns <https://pypi.org/project/aiodns/>`__, `brotlipy <https://pypi.org/project/brotlipy/>`__, `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)
+* python-dev (e.g. ``python3.10-dev`` for Python 3.10)
 
 Quick Example
 -------------

discord/__init__.py

@@ -13,57 +13,57 @@
 __author__ = 'Pycord Development'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development'
-__version__ = '2.0.0a'
+__version__ = '2.0.0b4'
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
 import logging
 from typing import NamedTuple, Literal
 
-from .client import *
-from .appinfo import *
-from .user import *
-from .emoji import *
-from .partial_emoji import *
+from . import utils, opus, abc, ui, sinks
 from .activity import *
-from .channel import *
-from .guild import *
-from .flags import *
-from .member import *
-from .message import *
+from .appinfo import *
 from .asset import *
+from .audit_logs import *
+from .bot import *
+from .channel import *
+from .client import *
+from .cog import Cog
+from .colour import *
+from .commands.__init__ import *
+from .components import *
+from .embeds import *
+from .emoji import *
+from .enums import *
 from .errors import *
-from .permissions import *
-from .role import *
 from .file import *
-from .colour import *
+from .flags import *
+from .guild import *
 from .integrations import *
+from .interactions import *
 from .invite import *
-from .template import *
-from .widget import *
-from .object import *
-from .reaction import *
-from . import utils, opus, abc, ui
-from .enums import *
-from .embeds import *
+from .member import *
 from .mentions import *
-from .shard import *
+from .message import *
+from .object import *
+from .partial_emoji import *
+from .permissions import *
 from .player import *
-from .webhook import *
-from .voice_client import *
-from .audit_logs import *
 from .raw_models import *
-from .team import *
-from .sticker import *
+from .reaction import *
+from .role import *
+from .scheduled_events import ScheduledEvent, ScheduledEventLocation
+from .shard import *
 from .stage_instance import *
-from .interactions import *
-from .components import *
+from .sticker import *
+from .team import *
+from .template import *
 from .threads import *
-from .bot import *
-from .commands import *
-from .cog import Cog
+from .user import *
+from .voice_client import *
+from .webhook import *
 from .welcome_screen import *
-from .scheduled_events import ScheduledEvent, ScheduledEventLocation
+from .widget import *
 
 
 class VersionInfo(NamedTuple):
@@ -74,6 +74,6 @@ class VersionInfo(NamedTuple):
     serial: int
 
 
-version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=0, releaselevel='alpha', serial=0)
+version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=0, releaselevel='beta', serial=4)
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())

discord/activity.py

@@ -43,7 +43,7 @@
     'CustomActivity',
 )
 
-"""If curious, this is the current schema for an activity.
+"""If you're curious, this is the current schema for an activity.
 
 It's fairly long so I will document it here: