Skip to content

Commit

Permalink
Merge branch 'master' into partial-autocomplete
Browse files Browse the repository at this point in the history
  • Loading branch information
Paillat-dev authored Dec 26, 2024
2 parents 33c5f21 + 3298cd0 commit 5e3cf70
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repos:
# - --remove-duplicate-keys
# - --remove-unused-variables
- repo: https://github.com/asottile/pyupgrade
rev: v3.19.0
rev: v3.19.1
hooks:
- id: pyupgrade
exclude: \.(po|pot|yml|yaml)$
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ These changes are available on the `master` branch, but have not yet been releas
- Replaced audioop (deprecated module) implementation of `PCMVolumeTransformer.read`
method with a pure Python equivalent.
([#2176](https://github.com/Pycord-Development/pycord/pull/2176))
- Updated `Guild.filesize_limit` to 10 MB instead of 25 MB following Discord's API
changes. ([#2671](https://github.com/Pycord-Development/pycord/pull/2671))

### Deprecated

Expand Down
10 changes: 5 additions & 5 deletions discord/guild.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,11 @@ class Guild(Hashable):
)

_PREMIUM_GUILD_LIMITS: ClassVar[dict[int | None, _GuildLimit]] = {
None: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=26214400),
0: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=26214400),
1: _GuildLimit(emoji=100, stickers=15, bitrate=128e3, filesize=26214400),
2: _GuildLimit(emoji=150, stickers=30, bitrate=256e3, filesize=52428800),
3: _GuildLimit(emoji=250, stickers=60, bitrate=384e3, filesize=104857600),
None: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=10_485_760),
0: _GuildLimit(emoji=50, stickers=5, bitrate=96e3, filesize=10_485_760),
1: _GuildLimit(emoji=100, stickers=15, bitrate=128e3, filesize=10_485_760),
2: _GuildLimit(emoji=150, stickers=30, bitrate=256e3, filesize=52_428_800),
3: _GuildLimit(emoji=250, stickers=60, bitrate=384e3, filesize=104_857_600),
}

def __init__(self, *, data: GuildPayload, state: ConnectionState):
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-r _.txt
pylint~=3.3.2
pylint~=3.3.3
pytest~=8.3.4
pytest-asyncio~=0.23.8
# pytest-order~=1.0.1
mypy~=1.13.0
mypy~=1.14.0
coverage~=7.6
pre-commit==4.0.1
codespell==2.3.0
Expand Down

0 comments on commit 5e3cf70

Please sign in to comment.