Merge branch 'master' into pre-commit-ci-update-config

CHANGELOG.md

@@ -182,6 +182,8 @@ These changes are available on the `master` branch, but have not yet been releas
   `None`. ([#2219](https://github.com/Pycord-Development/pycord/pull/2219))
 - Fixed ffmpeg being terminated prematurely when piping audio stream.
   ([#2240](https://github.com/Pycord-Development/pycord/pull/2240))
+- Fixed tasks looping infinitely when `tzinfo` is neither `None` nor UTC.
+  ([#2196](https://github.com/Pycord-Development/pycord/pull/2196))
 
 ## [2.4.1] - 2023-03-20
 

discord/ext/tasks/__init__.py

@@ -575,7 +575,7 @@ def _get_next_sleep_time(self) -> datetime.datetime:
             if self._current_loop == 0:
                 # if we're at the last index on the first iteration, we need to sleep until tomorrow
                 return datetime.datetime.combine(
-                    datetime.datetime.now(datetime.timezone.utc)
+                    datetime.datetime.now(self._time[0].tzinfo or datetime.timezone.utc)
                     + datetime.timedelta(days=1),
                     self._time[0],
                 )
@@ -584,18 +584,26 @@ def _get_next_sleep_time(self) -> datetime.datetime:
 
         if self._current_loop == 0:
             self._time_index += 1
-            if next_time > datetime.datetime.now(datetime.timezone.utc).timetz():
+            if (
+                next_time
+                > datetime.datetime.now(
+                    next_time.tzinfo or datetime.timezone.utc
+                ).timetz()
+            ):
                 return datetime.datetime.combine(
-                    datetime.datetime.now(datetime.timezone.utc), next_time
+                    datetime.datetime.now(next_time.tzinfo or datetime.timezone.utc),
+                    next_time,
                 )
             else:
                 return datetime.datetime.combine(
-                    datetime.datetime.now(datetime.timezone.utc)
+                    datetime.datetime.now(next_time.tzinfo or datetime.timezone.utc)
                     + datetime.timedelta(days=1),
                     next_time,
                 )
 
-        next_date = cast(datetime.datetime, self._last_iteration)
+        next_date = cast(
+            datetime.datetime, self._last_iteration.astimezone(next_time.tzinfo)
+        )
         if next_time < next_date.timetz():
             next_date += datetime.timedelta(days=1)