Fix

Author: davidhozic

docs/source/changelog.rst

@@ -40,6 +40,9 @@ Releases
 v3.1.2
 ===================
 - Fixed SQL compatibility
+- Fixed "TypeError: can't compare offset-naive and offset-aware datetimes" exception when
+  a rate limit happened (or slow mode).
+- Fixed selenium timer reset when no join attempt was triggered.
 
 
 v3.1.1

src/daf/guild/autoguild.py

@@ -466,12 +466,15 @@ async def get_next_guild():
                 trace(f"Could not query top.gg, stopping auto join.", TraceLEVELS.ERROR, exc)
                 self.guild_query_iter = None
 
-        if (yielded := await get_next_guild()) is None:
-            return
+        
+        while True:
+            if (yielded := await get_next_guild()) is None:
+                return
+
+            if client.get_guild(yielded.id) is not None:
+                self.guild_join_count += 1  # Guilds we are already joined also count
+                continue
 
-        no_error = True
-        # Not already joined in the guild
-        if client.get_guild(yielded.id) is None:
             try:
                 invite_url = await selenium.fetch_invite_link(yielded.url)
                 if invite_url is None:
@@ -485,17 +488,16 @@ async def get_next_guild():
                         "No error detected in browser,"
                         "but the guild can not be seen by the API wrapper."
                     )
+                
+                self.guild_join_count += 1  # Increase only on success
             except Exception as exc:
-                no_error = False
                 trace(
                     f"Joining guild raised an error. (Guild '{yielded.name}')",
                     TraceLEVELS.ERROR,
                     exc
                 )
 
-        if no_error:
-            # Don't count errored joins but count guilds we are already joined if they match the pattern
-            self.guild_join_count += 1
+            break
 
         self._reset_auto_join_timer()
 

src/daf/message/text_based.py

@@ -355,7 +355,7 @@ async def _handle_error(
             elif ex.status == 429:  # Rate limit
                 retry_after = int(ex.response.headers["Retry-After"]) + 5
                 if ex.code == 20016:    # Slow Mode
-                    self.next_send_time = datetime.now() + timedelta(seconds=retry_after)
+                    self.next_send_time = datetime.now().astimezone() + timedelta(seconds=retry_after)
                     trace(f"{channel.name} is in slow mode, retrying in {retry_after} seconds", TraceLEVELS.WARNING)
                     self._check_period()  # Fix the period
 
@@ -369,13 +369,6 @@ async def _handle_error(
 
         return handled, action
 
-    def _calc_next_time(self):
-        super()._calc_next_time()
-        slowmode_delay = self._slowmode
-        current_time = datetime.now().astimezone()
-        if self.next_send_time - current_time < slowmode_delay:
-            self.next_send_time = current_time + slowmode_delay
-
     async def _send_channel(self,
                             channel: Union[discord.TextChannel, discord.Thread, None],
                             text: Optional[str],