Fixed update_check not working

main.py

@@ -1,7 +1,6 @@
 import asyncio
 import logging
 import os
-import sys
 
 from aiohttp import ClientConnectorError
 from discord import Intents
@@ -107,11 +106,14 @@ async def main():
 
 
 if __name__ == "__main__":
+    import sys
+
     try:
         if os.name == "nt" and sys.version_info >= (3, 8):
             import tracemalloc
 
-            asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+            if sys.gettrace() is None:
+                asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
             tracemalloc.start()
 
         asyncio.run(main())

src/core/bot.py

@@ -233,11 +233,11 @@ async def log_command_usage(self, interaction: discord.Interaction) -> None:
         fmt_opts = f'\n{spc}'.join(options_list)
         _author_text = f"[ Author  ] > {user}"
         if interaction.guild_id is not None:
-            _guild_text = f"[  Guild  ] > {interaction.guild.name} ({interaction.guild_id})"
+            _guild_text = f"[ Guild   ] > {interaction.guild.name} ({interaction.guild_id})"
         else:
-            _guild_text = "[  Guild  ] > DM Channel"
+            _guild_text = "[ Guild   ] > DM Channel"
         _cmd_text = f"[ Command ] > /{cmd_name}"
-        pretty_msg = f"```\n{_author_text}\n{_guild_text}\n{_cmd_text}```"
+        pretty_msg = f"```\n{_guild_text}\n{_author_text}\n{_cmd_text}```"
         cmd_log_channel_id = self._config["constants"].get("command-log-channel-id")
         cmd_log = f"[Command: {user}] > /{cmd_name}"
         if fmt_opts:

src/core/database.py

@@ -776,7 +776,7 @@ async def get_series_to_update(self) -> list[MangaHeader] | None:
                             UNION
                             SELECT series_id, scanlator FROM tracked_guild_series
                         )
-                        AND scanlator NOT IN (SELECT scanlator FROM scanlators_config WHERE enabled = 0)
+                        AND scanlator IN (SELECT scanlator FROM scanlators_config WHERE enabled = true)
                         AND lower(status) NOT IN ({completed_db_set});
                     """
             ) as cursor:

src/core/objects.py

@@ -181,12 +181,11 @@ def __str__(self):
         return f"[{self.title}]({self._url})"
 
     def __eq__(self, other: Manga):
-        return isinstance(other, (Manga, PartialManga)) and (
-                self.url == other.url and
-                self.title == other.title or
-                self.id == other.id and
-                self.scanlator == other.scanlator
-        )
+        return (
+                isinstance(other, (Manga, PartialManga)) and self.url == other.url and self.title == other.title
+                or
+                isinstance(other, MangaHeader)
+        ) and self.id == other.id and self.scanlator == other.scanlator
 
     @property
     def id(self):
@@ -394,12 +393,11 @@ def __str__(self) -> str:
         return f"[{self.title}]({self.url})"
 
     def __eq__(self, other: Manga):
-        return isinstance(other, (Manga, PartialManga)) and (
-                self.url == other.url and
-                self.title == other.title or
-                self.id == other.id and
-                self.scanlator == other.scanlator
-        )
+        return (
+                isinstance(other, (Manga, PartialManga)) and self.url == other.url and self.title == other.title
+                or
+                isinstance(other, MangaHeader)
+        ) and self.id == other.id and self.scanlator == other.scanlator
 
 
 class Bookmark:
@@ -719,4 +717,6 @@ class MangaHeader:
     scanlator: str
 
     def __eq__(self, other: Manga | MangaHeader) -> bool:
-        return isinstance(other, MangaHeader) and self.id == other.id and self.scanlator == other.scanlator
+        return isinstance(
+            other, (MangaHeader, PartialManga, Manga)
+        ) and self.id == other.id and self.scanlator == other.scanlator

src/ext/update_check.py

@@ -53,7 +53,7 @@ async def handle_exception(self, coro: callable, scanlator: AbstractScanlator, r
 
         Parameters:
             coro: The coroutine that was called.
-            scanlator: The scanner that was used to check for updates.
+            scanlator: The scanner used to check for updates.
             req_url: The URL that was requested.
 
         Returns:
@@ -169,7 +169,7 @@ async def check_with_front_page_scraping(
         """
         Summary:
             Checks for updates by scraping the front page of the scanlator's website.
-            If the scanlator doesn't support front page scraping, it will return back all the manga that were passed in.
+            If the scanlator doesn't support front page scraping, it will return all the manga passed in.
             Otherwise, it may return a combination of Manga and ChapterUpdate objects.
 
         Args:
@@ -317,13 +317,12 @@ async def send_notifications(self, chapter_updates: list[ChapterUpdate]) -> None
                                 f"Failed to send update for {manga_title}| {chapter.name} to {user}", exc_info=e
                             )
                 next_update_ts = int(self.check_updates_task.next_iteration.timestamp())
-                await user.send(
-                    embed=(
-                        discord.Embed(
-                            description=f"The next update check will be <t:{next_update_ts}:R> at <t:{next_update_ts}:T>")
-                    ).set_footer(text=self.bot.user.display_name, icon_url=self.bot.user.display_avatar.url),
-                    delete_after=25 * 60  # 25 min
-                )
+                next_update_em = (
+                    discord.Embed(
+                        description=f"The next update check will be <t:{next_update_ts}:R> at <t:{next_update_ts}:T>")
+                ).set_footer(text=self.bot.user.display_name, icon_url=self.bot.user.display_avatar.url)
+
+                await user.send(embed=next_update_em, delete_after=25 * 60)  # 25 min
             except discord.Forbidden:  # DMs are closed
                 self.logger.warning(f"Failed to send update to {user} because DMs are closed!")
 
@@ -539,6 +538,7 @@ async def check_updates_task(self):
         try:
             # change this to grab ID|scanlator only
             series_to_update: list[MangaHeader] = await self.bot.db.get_series_to_update()
+            print(series_to_update)
             if not series_to_update:
                 return
 
@@ -624,7 +624,7 @@ async def check_patreon_users(self) -> None:
         try:
             while True:
                 pledge_response = await asyncio.to_thread(api_client.fetch_page_of_pledges,
-                                                          CAMPAIGN_ID, 2, cursor
+                                                          CAMPAIGN_ID, 2, cursor, None, None
                                                           )
                 all_pledges += pledge_response.data()
                 cursor = api_client.extract_cursor(pledge_response)