Merge branch 'master' into master

Author: probablyjassin

CHANGELOG.md

@@ -58,6 +58,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2611](https://github.com/Pycord-Development/pycord/pull/2611))
 - Fixed `TypeError` when passing `skus` parameter in `Client.entitlements()`.
   ([#2627](https://github.com/Pycord-Development/pycord/issues/2627))
+- Fixed `AttributeError` when sending polls with `PartialWebook`.
+  ([#2624](https://github.com/Pycord-Development/pycord/pull/2624))
 
 * Fixed type annotations of cached properties
   ([#2635](https://github.com/Pycord-Development/pycord/issues/2635))

discord/enums.py

@@ -224,6 +224,7 @@ class ChannelType(Enum):
     stage_voice = 13
     directory = 14
     forum = 15
+    media = 16
 
     def __str__(self):
         return self.name

discord/types/channel.py

@@ -44,7 +44,7 @@ class PermissionOverwrite(TypedDict):
     deny: str
 
 
-ChannelType = Literal[0, 1, 2, 3, 4, 5, 10, 11, 12, 13]
+ChannelType = Literal[0, 1, 2, 3, 4, 5, 10, 11, 12, 13, 14, 15, 16]
 
 
 class _BaseChannel(TypedDict):

discord/ui/view.py

@@ -126,7 +126,7 @@ class View:
     *items: :class:`Item`
         The initial items attached to this view.
     timeout: Optional[:class:`float`]
-        Timeout in seconds from last interaction with the UI before no longer accepting input.
+        Timeout in seconds from last interaction with the UI before no longer accepting input. Defaults to 180.0.
         If ``None`` then there is no timeout.
 
     Attributes

discord/webhook/async_.py

@@ -803,6 +803,12 @@ def create_user(self, data):
         # state parameter is artificial
         return BaseUser(state=self, data=data)  # type: ignore
 
+    def store_poll(self, poll: Poll, message_id: int):
+        if self._parent is not None:
+            return self._parent.store_poll(poll, message_id)
+        # state parameter is artificial
+        return None
+
     @property
     def http(self):
         if self._parent is not None:

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=62.6,<=72.2.0",
+    "setuptools>=62.6,<=75.3.0",
     "setuptools-scm>=6.2,<=8.1.0",
 ]
 build-backend = "setuptools.build_meta"