diff options
| author |  Joe Banks <[email protected]> | 2023-09-04 22:50:56 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2023-09-04 22:50:56 +0100 |
| commit | 20cc9564563ead3fd391b9882ff9aa3d2aec8b51 (patch) | |
| tree | 49c29916bede9fe238106fbf68081162e5846c1d | |
| parent | Bump version to 2.3.0 (diff) | |
| parent | Move unique constraint suppression to sess.commit instead of sess.add (diff) | |
Merge pull request #78 from python-discord/jb3/unique-violation-catching
Move unique constraint suppression to sess.commit instead of sess.add
| -rw-r--r-- | metricity/exts/event_listeners/member_listeners.py | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/metricity/exts/event_listeners/member_listeners.py b/metricity/exts/event_listeners/member_listeners.py index 47dc4ee..04090f1 100644 --- a/metricity/exts/event_listeners/member_listeners.py +++ b/metricity/exts/event_listeners/member_listeners.py @@ -56,21 +56,21 @@ class MemberListeners(commands.Cog): in_guild=True, )) else: - with contextlib.suppress(UniqueViolationError): - sess.add(User( - id=str(member.id), - name=member.name, - avatar_hash=getattr(member.avatar, "key", None), - guild_avatar_hash=getattr(member.guild_avatar, "key", None), - joined_at=member.joined_at, - created_at=member.created_at, - is_staff=BotConfig.staff_role_id in [role.id for role in member.roles], - public_flags=dict(member.public_flags), - pending=member.pending, - in_guild=True, - )) + sess.add(User( + id=str(member.id), + name=member.name, + avatar_hash=getattr(member.avatar, "key", None), + guild_avatar_hash=getattr(member.guild_avatar, "key", None), + joined_at=member.joined_at, + created_at=member.created_at, + is_staff=BotConfig.staff_role_id in [role.id for role in member.roles], + public_flags=dict(member.public_flags), + pending=member.pending, + in_guild=True, + )) - await sess.commit() + with contextlib.suppress(UniqueViolationError): + await sess.commit() @commands.Cog.listener() async def on_member_update(self, _before: discord.Member, member: discord.Member) -> None: @@ -108,21 +108,21 @@ class MemberListeners(commands.Cog): pending=member.pending, )) else: - with contextlib.suppress(UniqueViolationError): - sess.add(User( - id=str(member.id), - name=member.name, - avatar_hash=getattr(member.avatar, "key", None), - guild_avatar_hash=getattr(member.guild_avatar, "key", None), - joined_at=member.joined_at, - created_at=member.created_at, - is_staff=BotConfig.staff_role_id in roles, - public_flags=dict(member.public_flags), - in_guild=True, - pending=member.pending, - )) + sess.add(User( + id=str(member.id), + name=member.name, + avatar_hash=getattr(member.avatar, "key", None), + guild_avatar_hash=getattr(member.guild_avatar, "key", None), + joined_at=member.joined_at, + created_at=member.created_at, + is_staff=BotConfig.staff_role_id in roles, + public_flags=dict(member.public_flags), + in_guild=True, + pending=member.pending, + )) - await sess.commit() + with contextlib.suppress(UniqueViolationError): + await sess.commit() |