Skip to content

Commit

Permalink
Merge branch 'master' into typed-dict
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorukyum authored Nov 12, 2024
2 parents 99a1f76 + c8eee71 commit 7efb6d8
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

### Changed

Expand Down
5 changes: 5 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ Pycord is a modern, easy to use, feature-rich, and async ready API wrapper for D

======

Note
----

Pycord supports Python ``3.9`` - ``3.12``

Key Features
------------

Expand Down
1 change: 1 addition & 0 deletions discord/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ class ChannelType(Enum):
stage_voice = 13
directory = 14
forum = 15
media = 16

def __str__(self):
return self.name
Expand Down
2 changes: 1 addition & 1 deletion discord/types/channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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):
Expand Down
2 changes: 1 addition & 1 deletion discord/ui/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions discord/webhook/async_.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
"setuptools>=62.6,<=72.2.0",
"setuptools>=62.6,<=75.4.0",
"setuptools-scm>=6.2,<=8.1.0",
]
build-backend = "setuptools.build_meta"
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ sphinxext-opengraph==0.9.1
sphinx-copybutton==0.5.2
furo==2024.8.6
sphinx-autodoc-typehints==2.2.3
sphinx-intl==2.2.0
sphinx-intl==2.3.0
typing_extensions==4.12.2
levenshtein==0.26.1

0 comments on commit 7efb6d8

Please sign in to comment.