Skip to content

Commit b80a71f

Browse files
committed
fix inserting guilds with splashes
guild.splash is an Asset and we get sqlalchemy.exc.ProgrammingError: (psycopg2.ProgrammingError) can't adapt type 'Asset'
1 parent 99e63b7 commit b80a71f

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

statbot/client.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import discord
2020

2121
from .emoji import EmojiData
22+
from .sql import DiscordSqlHandler
2223
from .util import null_logger
2324

2425
__all__ = [
@@ -71,7 +72,12 @@ class EventIngestionClient(discord.Client):
7172
)
7273

7374
def __init__(
74-
self, config, sql, logger=null_logger, crawlers=None, crawler_logger=null_logger
75+
self,
76+
config,
77+
sql: DiscordSqlHandler,
78+
logger=null_logger,
79+
crawlers=None,
80+
crawler_logger=null_logger,
7581
):
7682
super().__init__(intents=discord.Intents.all())
7783
self.config = config

statbot/sql.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,22 @@
3939
"DiscordSqlHandler",
4040
]
4141

42+
4243
# Value builders
43-
def guild_values(guild):
44+
def guild_values(guild: discord.Guild):
4445
return {
4546
"guild_id": guild.id,
4647
"int_owner_id": int_hash(guild.owner.id),
4748
"name": guild.name,
48-
"icon": '' if guild.icon is None else guild.icon.url,
49+
"icon": "" if guild.icon is None else guild.icon.url,
4950
"voice_region": "deprecated",
5051
"afk_channel_id": getattr(guild.afk_channel, "id", None),
5152
"afk_timeout": guild.afk_timeout,
5253
"mfa": bool(guild.mfa_level),
5354
"verification_level": guild.verification_level,
5455
"explicit_content_filter": guild.explicit_content_filter,
5556
"features": guild.features,
56-
"splash": guild.splash,
57+
"splash": "" if guild.splash is None else guild.splash.key,
5758
}
5859

5960

0 commit comments

Comments
 (0)