Compare commits

..

No commits in common. "e3ca982efd2537c8df174eb497b58f5a7fad5b42" and "bb8621ba7259ba6232542ea99474224a04cb486c" have entirely different histories.

4 changed files with 152 additions and 922 deletions

View File

@ -432,8 +432,7 @@ class Storage:
return {**row, **drow}
elif chan_type == ChannelType.GUILD_VOICE:
voice_channel_data = dict(
await self.db.fetchrow(
voice_channel_data = await self.db.fetchrow(
"""
SELECT bitrate, user_limit
FROM guild_voice_channels
@ -441,13 +440,12 @@ class Storage:
""",
row["id"],
)
)
guild_region = await self.db.fetchval(
"""
SELECT region
FROM guilds
WHERE guilds.id = $1
WHERE guild.id = $1
""",
int(row["guild_id"]),
)
@ -455,7 +453,7 @@ class Storage:
# see https://gitlab.com/litecord/litecord/-/issues/130
voice_channel_data["rtc_region"] = guild_region
return {**row, **voice_channel_data}
return {**row, **dict(voice_channel_data)}
else:
# this only exists to trick mypy. this codepath is unreachable
raise AssertionError("Unreachable code path.")

1044
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -7,19 +7,19 @@ license = "GPLv3-only"
[tool.poetry.dependencies]
python = "^3.9"
bcrypt = "^4.0.1"
bcrypt = "^3.2.2"
itsdangerous = "^2.1.2"
asyncpg = "^0.27.0"
websockets = "^11.0.3"
asyncpg = "^0.26.0"
websockets = "^10.3"
Earl-ETF = "^2.1.2"
logbook = "^1.5.3"
Cerberus = "^1.3.4"
quart = "^0.18.4"
pillow = "^9.5.0"
aiohttp = "^3.8.4"
zstandard = "^0.21.0"
quart = "^0.18.0"
pillow = "^9.2.0"
aiohttp = "^3.8.1"
zstandard = "^0.18.0"
winter = {git = "https://gitlab.com/elixire/winter"}
wsproto = "^1.2.0"
wsproto = "^1.1.0"

View File

@ -1,5 +1,5 @@
[tox]
envlist = py3
envlist = py3.10
isolated_build = true
[testenv]