Skip to content

Commit df659f4

Browse files
committed
Merge branch 'refactor-utils' into viewless-components
2 parents 278fc9d + e202d7e commit df659f4

File tree

543 files changed

+54119
-13734
lines changed

Some content is hidden

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

543 files changed

+54119
-13734
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
* @Pycord-Development/pycord-next-contributors
1+
* @Pycord-Development/pycord-next-contributors
22
/.github @Lulalaby
3-
/crowdin.yml @Pycord-Development/maintain-translations
3+
/crowdin.yml @Pycord-Development/maintain-translations

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
working-directory: ./docs
4242
- name: "Crowdin"
4343
id: crowdin
44-
uses: crowdin/github-action@v2.10.0
44+
uses: crowdin/github-action@v2.11.0
4545
with:
4646
upload_sources: false
4747
upload_translations: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
4646
working-directory: ./docs
4747
- name: "Crowdin"
48-
uses: crowdin/github-action@v2.10.0
48+
uses: crowdin/github-action@v2.11.0
4949
with:
5050
upload_sources: true
5151
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 }}"

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ ci:
33

44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v5.0.0
6+
rev: v6.0.0
77
hooks:
88
- id: trailing-whitespace
99
exclude: \.(po|pot|yml|yaml)$
1010
- id: end-of-file-fixer
1111
exclude: \.(po|pot|yml|yaml)$
1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.12.0
13+
rev: v0.12.9
1414
hooks:
1515
- id: ruff
1616
args: [ --fix ]

CHANGELOG.md

Lines changed: 21 additions & 0 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

@@ -113,6 +125,9 @@ These changes are available on the `master` branch, but have not yet been releas
113125
([#2761](https://github.com/Pycord-Development/pycord/pull/2761))
114126
- Updated `valid_locales` to support `in` and `es-419`.
115127
([#2767](https://github.com/Pycord-Development/pycord/pull/2767))
128+
- Added support for emoji aliases like `:smile:` in PartialEmoji.from_str. Also applied
129+
the same logic in PartialEmojiConverter.
130+
([#2815](https://github.com/Pycord-Development/pycord/pull/2815))
116131
- Fixed `Webhook.edit` not working with `attachments=[]`.
117132
([#2779](https://github.com/Pycord-Development/pycord/pull/2779))
118133
- Fixed GIF-based `Sticker` returning the wrong `url`.
@@ -121,6 +136,12 @@ These changes are available on the `master` branch, but have not yet been releas
121136
([#2800](https://github.com/Pycord-Development/pycord/pull/2800))
122137
- Fixed `VoiceClient.connect` failing to do initial connection.
123138
([#2812](https://github.com/Pycord-Development/pycord/pull/2812))
139+
- Fixed `VoiceClient.connect` failing to do initial connection.
140+
([#2812](https://github.com/Pycord-Development/pycord/pull/2812))
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))
124145

125146
### Changed
126147

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
@@ -149,7 +149,9 @@ class Asset(AssetMixin):
149149
150150
.. describe:: hash(x)
151151
152-
Returns the hash of the asset.
152+
Returns the asset's url's hash.
153+
154+
This is equivalent to hash(:attr:`url`).
153155
"""
154156

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

discord/automod.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,12 +406,12 @@ def __repr__(self) -> str:
406406
def __str__(self) -> str:
407407
return self.name
408408

409-
@cached_property
409+
@property
410410
def guild(self) -> Guild | None:
411411
"""The guild this rule belongs to."""
412412
return self._state._get_guild(self.guild_id)
413413

414-
@cached_property
414+
@property
415415
def creator(self) -> Member | None:
416416
"""The member who created this rule."""
417417
if self.guild is None:

0 commit comments

Comments
 (0)