Fix broken DiscordMember lookups in database (#570)

* Fix broken DiscordMember lookups in database

* Fix more broken lookups

Author: CarrotManMatt

cogs/induct.py

@@ -66,7 +66,9 @@ async def on_member_update(self, before: discord.Member, after: discord.Member)
 
         with contextlib.suppress(IntroductionReminderOptOutMember.DoesNotExist):
             await (
-                await IntroductionReminderOptOutMember.objects.aget(discord_id=before.id)
+                await IntroductionReminderOptOutMember.objects.aget(
+                    discord_member__discord_id=before.id
+                )
             ).adelete()
 
         reminder_message: discord.Message

cogs/remind_me.py

@@ -13,7 +13,7 @@
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 
-from db.core.models import DiscordReminder
+from db.core.models import DiscordMember, DiscordReminder
 from utils import TeXBotBaseCog
 
 if TYPE_CHECKING:
@@ -227,7 +227,9 @@ async def remind_me(  # type: ignore[misc]
 
         try:
             reminder: DiscordReminder = await DiscordReminder.objects.acreate(  # type: ignore[misc]
-                discord_id=ctx.user.id,
+                discord_member=(
+                    await DiscordMember.objects.aget_or_create(discord_id=ctx.user.id)
+                )[0],
                 message=message or "",
                 channel_id=ctx.channel_id,
                 send_datetime=parsed_time[0],

cogs/send_introduction_reminders.py

@@ -319,7 +319,7 @@ async def opt_out_introduction_reminders_button_callback(  # type: ignore[misc]
                 try:
                     introduction_reminder_opt_out_member: IntroductionReminderOptOutMember = (
                         await IntroductionReminderOptOutMember.objects.aget(
-                            discord_id=interaction_member.id
+                            discord_member__discord_id=interaction_member.id
                         )
                     )
                 except IntroductionReminderOptOutMember.DoesNotExist:

cogs/strike.py

@@ -12,7 +12,7 @@
 from discord.ui import View
 
 from config import settings
-from db.core.models import DiscordMemberStrikes
+from db.core.models import DiscordMember, DiscordMemberStrikes
 from exceptions import (
     GuildDoesNotExistError,
     NoAuditLogsStrikeTrackingError,
@@ -408,7 +408,11 @@ async def _command_perform_strike(
             return
 
         member_strikes: DiscordMemberStrikes = (
-            await DiscordMemberStrikes.objects.aget_or_create(discord_id=strike_member.id)
+            await DiscordMemberStrikes.objects.aget_or_create(
+                discord_member=(
+                    await DiscordMember.objects.aget_or_create(discord_id=strike_member.id)
+                )[0]
+            )
         )[0]
 
         await self._confirm_increase_strike(
@@ -524,7 +528,11 @@ async def _confirm_manual_add_strike(
             ) from fetch_log_channel_error
 
         member_strikes: DiscordMemberStrikes = (
-            await DiscordMemberStrikes.objects.aget_or_create(discord_id=strike_user.id)
+            await DiscordMemberStrikes.objects.aget_or_create(
+                discord_member=(
+                    await DiscordMember.objects.aget_or_create(discord_id=strike_user.id)
+                )[0]
+            )
         )[0]
 
         STRIKES_OUT_OF_SYNC_WITH_BAN: Final[bool] = bool(
@@ -861,7 +869,9 @@ async def get_strikes(  # type: ignore[misc]
         strikes_count: int = 0
         try:
             strikes_count = (
-                await DiscordMemberStrikes.objects.aget(discord_id=strike_member.id)
+                await DiscordMemberStrikes.objects.aget(
+                    discord_member__discord_id=strike_member.id
+                )
             ).strikes
         except DiscordMemberStrikes.DoesNotExist:
             logger.debug("No strikes found for user %s", strike_member)
@@ -904,7 +914,11 @@ async def decrement_strikes(  # type: ignore[misc]
 
         try:
             discord_member_strikes: DiscordMemberStrikes = (
-                await DiscordMemberStrikes.objects.aget(discord_id=strike_member.id)
+                await DiscordMemberStrikes.objects.aget(
+                    discord_member=(
+                        await DiscordMember.objects.aget_or_create(discord_id=strike_member.id)
+                    )[0]
+                )
             )
         except DiscordMemberStrikes.DoesNotExist:
             await ctx.respond(