Skip to content

Commit 283f02f

Browse files
authored
Merge branch 'master' into fix/client-run
Signed-off-by: Paillat <[email protected]>
2 parents 63b36f8 + b62052a commit 283f02f

File tree

534 files changed

+51549
-12498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

534 files changed

+51549
-12498
lines changed

.github/workflows/docs-localization-download.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
working-directory: ./docs
4141
- name: "Crowdin"
4242
id: crowdin
43-
uses: crowdin/github-action@v2.7.1
43+
uses: crowdin/github-action@v2.9.1
4444
with:
4545
upload_sources: false
4646
upload_translations: false

.github/workflows/docs-localization-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
4545
working-directory: ./docs
4646
- name: "Crowdin"
47-
uses: crowdin/github-action@v2.7.1
47+
uses: crowdin/github-action@v2.9.1
4848
with:
4949
upload_sources: true
5050
upload_translations: false

.github/workflows/readthedocs.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,11 @@ jobs:
1818
environment: documentation
1919
strategy:
2020
matrix:
21-
rdt_projects: [
22-
"pycord-spanish",
23-
"pycord-japanese",
24-
"pycord-brazilian",
25-
"pycord-russian",
26-
"pycord-german",
27-
"pycord-hindi",
28-
"pycord-korean",
29-
"pycord-italian",
30-
"pycord-chinese",
31-
"pycord-french"
32-
]
21+
rdt_projects: ["pycord-spanish", "pycord-japanese", "pycord-brazilian", "pycord-russian", "pycord-german", "pycord-hindi", "pycord-korean", "pycord-italian", "pycord-chinese", "pycord-french", "pyord-turkish"]
3322
steps:
3423
- name: "Trigger RDT ${{ matrix.rdt_projects }}"
3524
run: |
3625
PROJECT=${{ matrix.rdt_projects }}
3726
curl --location --request POST "https://readthedocs.org/api/v3/projects/$PROJECT/versions/master/builds/" \
3827
--header 'Content-Type: application/json' \
39-
--header "Authorization: Token ${{ secrets.READTHEDOCS_TOKEN }}"
28+
--header "Authorization: Token ${{ secrets.READTHEDOCS_TOKEN }}"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
environment: release
1717
steps:
1818
- name: "Security Check"
19-
uses: Aiko-IT-Systems/execute-whitelist-action@v1.0.0
19+
uses: Pycord-Development/execute-whitelist-action@v2.0.0
2020
with:
2121
whitelisted-github-ids: ${{ vars.ALLOWED_USER_IDS }}
2222
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/todo-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: "Checkout Repository"
2424
uses: actions/checkout@v4
2525
- name: "Track TODO Action"
26-
uses: ribtoks/[email protected].14-beta
26+
uses: ribtoks/[email protected].15-beta
2727
with:
2828
TOKEN: ${{ secrets.GITHUB_TOKEN }}
2929
REPO: ${{ github.repository }}

CHANGELOG.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,24 @@ These changes are available on the `master` branch, but have not yet been releas
5151
([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
5252
- Added `Message.forward_to`, `Message.snapshots`, and other related attributes.
5353
([#2598](https://github.com/Pycord-Development/pycord/pull/2598))
54+
- Add missing `Guild` feature flags and `Guild.edit` parameters.
55+
([#2672](https://github.com/Pycord-Development/pycord/pull/2672))
5456
- Added the ability to change the API's base URL with `Route.API_BASE_URL`.
5557
([#2714](https://github.com/Pycord-Development/pycord/pull/2714))
5658
- Added the ability to pass a `datetime.time` object to `format_dt`.
5759
([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
60+
- Added support for type hinting slash command options with `typing.Annotated`.
61+
([#2782](https://github.com/Pycord-Development/pycord/pull/2782))
62+
- Added conversion to `Member` in `MentionableConverter`.
63+
([#2775](https://github.com/Pycord-Development/pycord/pull/2775))
5864
- Added `discord.Interaction.created_at`.
5965
([#2801](https://github.com/Pycord-Development/pycord/pull/2801))
66+
- Added `User.nameplate` property.
67+
([#2817](https://github.com/Pycord-Development/pycord/pull/2817))
68+
- Added role gradients support with `Role.colours` and the `RoleColours` class.
69+
([#2818](https://github.com/Pycord-Development/pycord/pull/2818))
70+
- Added `Interaction.attachment_size_limit`.
71+
([#2854](https://github.com/Pycord-Development/pycord/pull/2854))
6072

6173
### Fixed
6274

@@ -83,6 +95,8 @@ These changes are available on the `master` branch, but have not yet been releas
8395
([#2624](https://github.com/Pycord-Development/pycord/pull/2624))
8496
- Fixed editing `ForumChannel` flags not working.
8597
([#2641](https://github.com/Pycord-Development/pycord/pull/2641))
98+
- Fixed Async I/O errors that could be raised when using `Client.run`.
99+
([#2645](https://github.com/Pycord-Development/pycord/pull/2645))
86100
- Fixed `AttributeError` when accessing `Member.guild_permissions` for user installed
87101
apps. ([#2650](https://github.com/Pycord-Development/pycord/pull/2650))
88102
- Fixed type annotations of cached properties.
@@ -113,6 +127,9 @@ These changes are available on the `master` branch, but have not yet been releas
113127
([#2761](https://github.com/Pycord-Development/pycord/pull/2761))
114128
- Updated `valid_locales` to support `in` and `es-419`.
115129
([#2767](https://github.com/Pycord-Development/pycord/pull/2767))
130+
- Added support for emoji aliases like `:smile:` in PartialEmoji.from_str. Also applied
131+
the same logic in PartialEmojiConverter.
132+
([#2815](https://github.com/Pycord-Development/pycord/pull/2815))
116133
- Fixed `Webhook.edit` not working with `attachments=[]`.
117134
([#2779](https://github.com/Pycord-Development/pycord/pull/2779))
118135
- Fixed GIF-based `Sticker` returning the wrong `url`.
@@ -121,8 +138,10 @@ These changes are available on the `master` branch, but have not yet been releas
121138
([#2800](https://github.com/Pycord-Development/pycord/pull/2800))
122139
- Fixed `VoiceClient.connect` failing to do initial connection.
123140
([#2812](https://github.com/Pycord-Development/pycord/pull/2812))
124-
- Fixed Async I/O errors that could be raised when using `Client.run`.
125-
([#2645](https://github.com/Pycord-Development/pycord/pull/2645))
141+
- Fixed `AttributeError` when printing a File component's `__repr__`.
142+
([#2843](https://github.com/Pycord-Development/pycord/pull/2843))
143+
- Fixed `TypeError` when using `@option` with certain annotations and along with
144+
`channel_types`. ([#2835](https://github.com/Pycord-Development/pycord/pull/2835))
126145

127146
### Changed
128147

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include LICENSE
33
include requirements.txt
44
include discord/bin/*.dll
55
include discord/py.typed
6+
include discord/emojis.json
67

78
prune .github
89
prune docs

crowdin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ preserve_hierarchy: true
55

66
commit_message: "docs: Update translations"
77

8-
export_languages: ["de", "ja", "fr", "it", "hi", "ko", "pt-BR", "es-ES", "zh-CN"]
8+
export_languages: ["de", "ja", "fr", "it", "hi", "ko", "pt-BR", "es-ES", "zh-CN", "tr"]
99

1010
bundles:
1111
- 1

discord/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
from .channel import *
3636
from .client import *
3737
from .cog import *
38+
from .collectibles import *
3839
from .colour import *
3940
from .commands import *
4041
from .components import *

discord/asset.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ class Asset(AssetMixin):
144144
145145
.. describe:: hash(x)
146146
147-
Returns the hash of the asset.
147+
Returns the asset's url's hash.
148+
149+
This is equivalent to hash(:attr:`url`).
148150
"""
149151

150152
__slots__: tuple[str, ...] = (

0 commit comments

Comments
 (0)