Discord API

Author: davidhozic

docs/source/changelog.rst

@@ -32,6 +32,11 @@ Glossary
 Releases
 ----------------------
 
+v2.3.6
+=============
+- Fixed voice not working due to Discord's API changes.
+
+
 v2.3.5
 =============
 - Fixed ``typechecked`` module error

src/_discord/__init__.py

@@ -12,16 +12,22 @@
 __author__ = "Pycord Development"
 __license__ = "MIT"
 __copyright__ = "Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development"
-__version__ = "2.2.2"
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 
 import logging
-from typing import Literal, NamedTuple
+
+# We need __version__ to be imported first
+# isort: off
+from ._version import *
+
+# isort: on
+
 
 from . import abc, opus, sinks, ui, utils
 from .activity import *
 from .appinfo import *
+from .application_role_connection import *
 from .asset import *
 from .audit_logs import *
 from .automod import *
@@ -66,17 +72,4 @@
 from .welcome_screen import *
 from .widget import *
 
-
-class VersionInfo(NamedTuple):
-    major: int
-    minor: int
-    micro: int
-    releaselevel: Literal["alpha", "beta", "candidate", "final"]
-    serial: int
-
-
-version_info: VersionInfo = VersionInfo(
-    major=2, minor=2, micro=2, releaselevel="final", serial=0
-)
-
 logging.getLogger(__name__).addHandler(logging.NullHandler())

src/_discord/_typed_dict.py

@@ -0,0 +1,37 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-present Pycord Development
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+"""
+import sys
+
+# PEP 655 Required and NotRequired were added in python 3.11. This file is simply a
+# shortcut import, so we don't have to repeat this import logic across files.
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, Required, TypedDict
+else:
+    from typing_extensions import NotRequired, Required, TypedDict
+
+__all__ = (
+    "Required",
+    "NotRequired",
+    "TypedDict",
+)

src/_discord/_version.py

@@ -0,0 +1,138 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 Rapptz
+Copyright (c) 2021-present Pycord Development
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+"""
+from __future__ import annotations
+
+import datetime
+import re
+import warnings
+from importlib.metadata import PackageNotFoundError, version
+
+from ._typed_dict import TypedDict
+
+__all__ = ("__version__", "VersionInfo", "version_info")
+
+from typing import Literal, NamedTuple
+
+from .utils import deprecated
+
+__version__ = "2.4.1"
+
+
+class AdvancedVersionInfo(TypedDict):
+    serial: int
+    build: int | None
+    commit: str | None
+    date: datetime.date | None
+
+
+class VersionInfo(NamedTuple):
+    major: int
+    minor: int
+    micro: int
+    releaselevel: Literal["alpha", "beta", "candidate", "final"]
+
+    # We can't set instance attributes on a NamedTuple, so we have to use a
+    # global variable to store the advanced version info.
+    @property
+    def advanced(self) -> AdvancedVersionInfo:
+        return _advanced
+
+    @advanced.setter
+    def advanced(self, value: object) -> None:
+        global _advanced
+        _advanced = value
+
+    @property
+    @deprecated("releaselevel", "2.4")
+    def release_level(self) -> Literal["alpha", "beta", "candidate", "final"]:
+        return self.releaselevel
+
+    @property
+    @deprecated('.advanced["serial"]', "2.4")
+    def serial(self) -> int:
+        return self.advanced["serial"]
+
+    @property
+    @deprecated('.advanced["build"]', "2.4")
+    def build(self) -> int | None:
+        return self.advanced["build"]
+
+    @property
+    @deprecated('.advanced["commit"]', "2.4")
+    def commit(self) -> str | None:
+        return self.advanced["commit"]
+
+    @property
+    @deprecated('.advanced["date"]', "2.4")
+    def date(self) -> datetime.date | None:
+        return self.advanced["date"]
+
+
+version_regex = re.compile(
+    r"^(?P<major>\d+)(?:\.(?P<minor>\d+))?(?:\.(?P<patch>\d+))?"
+    r"(?:(?P<level>rc|a|b)(?P<serial>\d+))?"
+    r"(?:\.dev(?P<build>\d+))?"
+    r"(?:\+(?:(?:g(?P<commit>[a-fA-F0-9]{4,40})(?:\.d(?P<date>\d{4}\d{2}\d{2})|))|d(?P<date1>\d{4}\d{2}\d{2})))?$"
+)
+version_match = version_regex.match(__version__)
+if version_match is None:
+    raise RuntimeError(f"Invalid version string: {__version__}")
+raw_info = version_match.groupdict()
+
+level_info: Literal["alpha", "beta", "candidate", "final"]
+
+if raw_info["level"] == "a":
+    level_info = "alpha"
+elif raw_info["level"] == "b":
+    level_info = "beta"
+elif raw_info["level"] == "rc":
+    level_info = "candidate"
+elif raw_info["level"] is None:
+    level_info = "final"
+else:
+    raise RuntimeError("Invalid release level")
+
+if (raw_date := raw_info["date"] or raw_info["date1"]) is not None:
+    date_info = datetime.date(
+        int(raw_date[:4]),
+        int(raw_date[4:6]),
+        int(raw_date[6:]),
+    )
+else:
+    date_info = None
+
+version_info: VersionInfo = VersionInfo(
+    major=int(raw_info["major"] or 0) or None,
+    minor=int(raw_info["minor"] or 0) or None,
+    micro=int(raw_info["patch"] or 0) or None,
+    releaselevel=level_info,
+)
+
+_advanced = AdvancedVersionInfo(
+    serial=raw_info["serial"],
+    build=int(raw_info["build"] or 0) or None,
+    commit=raw_info["commit"],
+    date=date_info,
+)