chore: Merge upstream #62
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…2824) * 📝 update license format in pyproject.toml * chore: reference license file Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * fix: classifer is invalid now Signed-off-by: Lala Sabathil <aiko@aitsys.dev> --------- Signed-off-by: Lala Sabathil <aiko@aitsys.dev> Co-authored-by: Lala Sabathil <aiko@aitsys.dev> (cherry picked from commit 1c65fc8)
…lopment#2806) * 📝 Fix hyperlink in CHANGELOG.md * Update CHANGELOG.md Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * style(pre-commit): auto fixes from pre-commit.com hooks --------- Signed-off-by: Lala Sabathil <aiko@aitsys.dev> Co-authored-by: Lala Sabathil <aiko@aitsys.dev> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> (cherry picked from commit 1214a70)
Signed-off-by: UK <41271523+NeloBlivion@users.noreply.github.com> Signed-off-by: Lala Sabathil <lala@pycord.dev> Signed-off-by: plun1331 <plun1331@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Lala Sabathil <lala@pycord.dev> Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Co-authored-by: Paillat <jeremiecotti@ik.me> Co-authored-by: Ice Wolfy <44532864+Icebluewolf@users.noreply.github.com> Co-authored-by: plun1331 <plun1331@gmail.com> Co-authored-by: JustaSqu1d <89910983+JustaSqu1d@users.noreply.github.com> (cherry picked from commit a5aa21f)
) Signed-off-by: Lala Sabathil <aiko@aitsys.dev> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Lala Sabathil <aiko@aitsys.dev> (cherry picked from commit 2ae01b7)
…pment#2843) * 🐛 Fix missing self. attribution in File * 📝 CHANGELOG.md (cherry picked from commit 0102b7d)
🐛 Fix error in on_timeout, should use .parent not .message (cherry picked from commit 9bef192)
… hash return values (Pycord-Development#2832) 📝 update docstrings for Asset and Attachment classes to clarify hash return values (cherry picked from commit 35c7dc1)
…ong with `channel_types` (Pycord-Development#2835) * 🐛 Option: Always set `input_type` to `SlashCommandOptionType.channel` when `channel_types` is set * 📝 CHANGELOG.md * style(pre-commit): auto fixes from pre-commit.com hooks --------- Signed-off-by: Paillat <me@paillat.dev> Signed-off-by: Lala Sabathil <lala@pycord.dev> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Lala Sabathil <lala@pycord.dev> (cherry picked from commit 213b639)
…lopment#2775) * Update CHANGELOG.md Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * fix member not being converted Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * fix member not being converted Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * style(pre-commit): auto fixes from pre-commit.com hooks * Update CHANGELOG.md Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: plun1331 <plun1331@gmail.com> Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * refactor(bridge): remove redundant constructor in BridgeOption * feat(bridge): enhance BridgeOption initialization with converter support * Update discord/ext/bridge/core.py Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * improved code quality --------- Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: plun1331 <plun1331@gmail.com> Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> (cherry picked from commit a82f562)
…#2672) * ✨ Add missing `Guild` feature flags * ✨ Add `Guild.activity_feed_enabled` to know whether the activity feed is enabled for the guild. * 📝 Docs * 📝 CHANGELOG.md * chore: 👽 Update base max filesize to `10` Mb (Pycord-Development#2671) * 👽 Update base max filesize to `10` Mb * 📝 CHANGELOG.md * 📝 Requested changes * ⚡ Compute `features` only once * Remove variable * ♻️ change `raid_alerts` to `enable_raid_alerts` * 🚑 Forgot to rename `enable_raid_alerts` * ♻️ change `enable_raid_alerts` to `disable_raid_alerts` Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> * fix docstring Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> --------- Signed-off-by: Paillat <me@paillat.dev> Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> (cherry picked from commit 3bb7163) # Conflicts: # discord/guild.py # discord/types/guild.py
Signed-off-by: Lala Sabathil <lala@pycord.dev> (cherry picked from commit a990e74)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com> (cherry picked from commit dd7d5a6)
Pycord-Development#2782) * fix: add support for Literal type in typing annotations for Discord choices * Update CHANGELOG.md * Update CHANGELOG.md Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: JustaSqu1d <89910983+JustaSqu1d@users.noreply.github.com> Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * refactor: move condition to method * docs: update changelog * fix: ensure all literal values are of the same type in SlashCommand options * Update discord/commands/core.py Co-authored-by: Paillat <jeremiecotti@ik.me> Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * Update discord/commands/core.py Co-authored-by: Paillat <jeremiecotti@ik.me> Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * style(pre-commit): auto fixes from pre-commit.com hooks --------- Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Co-authored-by: JustaSqu1d <89910983+JustaSqu1d@users.noreply.github.com> Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Co-authored-by: Paillat <jeremiecotti@ik.me> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> (cherry picked from commit 4392105)
) * fix file component patching * style(pre-commit): auto fixes from pre-commit.com hooks * component typing --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> (cherry picked from commit bda1dfe)
…ent#2818) * ✨ Add support for enhanced role colors in `Role` * ✨ add RoleColours support to `Role.edit` * ✨ add RoleColours support to role creation in `Guild` and define default colors in `RoleColours` * ✨ add support for RoleColours in role creation and editing * ✨ update role attributes to use RoleColours and enhance color properties * 📝 CHANGELOG.md * 📝 add documentation for RoleColours and its attributes * ✏️ fix version annotation for primary color method in role.py * ✨ add holographic role support in RoleColours * 📝 update tertiary color documentation to specify allowed value * ✨ Finish implementing holographic support * 🗑️ Add deprecation warnings for singular colour properties in Role and Guild (cherry picked from commit 975a0d9)
* ✨ add Nameplate class and integration in user model * 🏷️ feat: add nameplate attribute to User class * ✨ add NameplatePalette enum and enhance Nameplate class with asset retrieval * 📝 add nameplate attribute to User class documentation * 📝 CHANGELOG.md * 📝 add versionadded directive for Nameplate class and NameplatePalette enum * 📝 update Nameplate class documentation to include undocumented members * ✏️ Fix typo in NameplatePalette * 📝 standardize nameplate color attributes to lowercase and document each color in enums * 📝 refine Nameplate class docstring for clarity * Update discord/collectibles.py Signed-off-by: Paillat <jeremiecotti@ik.me> * ♻️ remove NameplatePalette enum and change palette type to str --------- Signed-off-by: Paillat <jeremiecotti@ik.me> Signed-off-by: Paillat <paillat@pycord.dev> (cherry picked from commit 58c0dfc)
…from_str (redo) (Pycord-Development#2815) * Revert "Revert "fix: support emoji aliases like `:smile:` in PartialEmoji.fro…" This reverts commit 8619b69. * Update discord/partial_emoji.py Co-authored-by: Paillat <paillat@pycord.dev> Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * Update CHANGELOG.md Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * Update CHANGELOG.md Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * Update MANIFEST.in Signed-off-by: Lala Sabathil <lala@pycord.dev> * feat: allow usage of unicode emoji in PartialEmojiConverter (Pycord-Development#2819) * Update converter.py * fix: enhance PartialEmojiConverter to support direct emoji names * update doc * Revert 2814 revert 2774 emoji (Pycord-Development#2820) * Add Unicode emoji support to PartialEmojiConverter PartialEmojiConverter now recognizes standard Unicode emojis using a new UNICODE_EMOJIS set loaded from emojis.json. The emoji mapping and set are moved to discord.utils for reuse, and references in partial_emoji.py are updated accordingly. * style(pre-commit): auto fixes from pre-commit.com hooks * Update converter.py Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * Update converter.py * fix(utils): update UNICODE_EMOJIS to use values from EMOJIS_MAP --------- Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * added back support of smile and `:smile:` (Pycord-Development#2822) * Add Unicode emoji support to PartialEmojiConverter PartialEmojiConverter now recognizes standard Unicode emojis using a new UNICODE_EMOJIS set loaded from emojis.json. The emoji mapping and set are moved to discord.utils for reuse, and references in partial_emoji.py are updated accordingly. * style(pre-commit): auto fixes from pre-commit.com hooks * Update converter.py Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> * Update converter.py * fix(utils): update UNICODE_EMOJIS to use values from EMOJIS_MAP * fix(partial_emoji): simplify emoji name extraction by using removeprefix and removesuffix * style(pre-commit): auto fixes from pre-commit.com hooks --------- Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Update discord/partial_emoji.py Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * style(pre-commit): auto fixes from pre-commit.com hooks * Update discord/partial_emoji.py Co-authored-by: Paillat <me@paillat.dev> Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * Update CHANGELOG.md Co-authored-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Signed-off-by: Lala Sabathil <aiko@aitsys.dev> * style(pre-commit): auto fixes from pre-commit.com hooks * Update discord/utils.py Co-authored-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Signed-off-by: Lala Sabathil <aiko@aitsys.dev> --------- Signed-off-by: Lala Sabathil <aiko@aitsys.dev> Signed-off-by: Lala Sabathil <lala@pycord.dev> Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Co-authored-by: Paillat <paillat@pycord.dev> Co-authored-by: Lumouille <144063653+Lumabots@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Paillat <me@paillat.dev> (cherry picked from commit 4ccb0c0)
Signed-off-by: Lala Sabathil <lala@pycord.dev> (cherry picked from commit bf26465)
Signed-off-by: Lala Sabathil <lala@pycord.dev> (cherry picked from commit 7c598bc)
Signed-off-by: hich4t <hich4t@enchoral.me> Co-authored-by: Paillat <jeremiecotti@ik.me> Co-authored-by: Lala Sabathil <lala@pycord.dev> (cherry picked from commit b43969a)
… `functools.cached_property` (Pycord-Development#2769) * feat: Replaced useless `cached_property` with `property` and moved to `functools.cached_property` * style(pre-commit): auto fixes from pre-commit.com hooks * chore: switch to `functools.cached_property` for intensive code * style(pre-commit): auto fixes from pre-commit.com hooks * Update context.py Signed-off-by: Paillat <paillat@pycord.dev> --------- Signed-off-by: Paillat <paillat@pycord.dev> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Paillat <paillat@pycord.dev> (cherry picked from commit 7ab3af9)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Ice Wolfy <icebluewolf05@gmail.com> Co-authored-by: Paillat <paillat@pycord.dev> (cherry picked from commit 8e2185c)
|
Brother in christ 💀 what is that diff size |
|
It's the autogenerated translations stuff |
|
Can this get merged ? |
Signed-off-by: Paillat <paillat@pycord.dev>
VincentRPS
approved these changes
Aug 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Merge Pycord-developement/pycord by cherry picking stuff. Also updates deps in uv.lock
Information
examples, ...).
Checklist
type: ignorecomments were used, a comment is also left explaining why.