BUGFIX:

- Scheduler: /timeleft and server status embed did not show the correct time for the new "times" setting

Author: karel26

plugins/monitoring/serverstats.py

@@ -543,7 +543,7 @@ async def render(self, server_name: str | None, interval: str | None = '1 month'
 
         # Step 5: Customize plot appearance
         self.axes.set_title(
-            f'Users per Mission-Time | past {interval.replace("1", "").strip()}',
+            f'Average Users per Mission-Time | past {interval.replace("1", "").strip()}',
             color='white',
             fontsize=25
         )

plugins/scheduler/commands.py

@@ -1339,7 +1339,7 @@ async def timeleft(self, interaction: discord.Interaction,
         else:
             item = f'The mission on server {_server.name}'
         message = f"{item} will {what}"
-        if (any(key in rconf for key in ['local_times', 'utc_times', 'real_time', 'idle_time', 'cron']) or
+        if (any(key in rconf for key in ['times', 'real_time', 'idle_time', 'cron']) or
                 _server.status == Status.RUNNING):
             if _server.restart_time >= datetime.now(tz=timezone.utc):
                 message += f" <t:{int(_server.restart_time.timestamp())}:R>"

plugins/scheduler/listener.py

@@ -59,27 +59,18 @@ async def get_next_restart(self, server: Server, restart: dict | list) -> tuple[
                     return delta, restart
                 else:
                     return 0, restart
-            elif 'local_times' in restart:
+            elif 'times' in restart:
+                config = self.get_config(server)
+                tz = (
+                    ZoneInfo(config.get('timezone'))
+                    if 'timezone' in config
+                    else None
+                )
                 min_time_difference = 86400
-                for t in restart['local_times']:
-                    restart_time = utils.parse_time(t)
-                    check_time = datetime.now().replace(year=restart_time.year, month=restart_time.month,
-                                                        day=restart_time.day, second=0, microsecond=0)
-                    if restart_time <= check_time:
-                        restart_time += timedelta(days=1)
-                    time_difference_in_seconds = int((restart_time - check_time).total_seconds())
-                    if 0 < time_difference_in_seconds < min_time_difference:
-                        min_time_difference = time_difference_in_seconds
-                if min_time_difference != 86400:
-                    return min_time_difference, restart
-                else:
-                    return None
-            elif 'utc_times' in restart:
-                min_time_difference = 86400
-                for t in restart['utc_times']:
-                    restart_time = utils.parse_time(t, tz=timezone.utc)
-                    check_time = datetime.now(tz=timezone.utc).replace(
-                        year=restart_time.year, month=restart_time.month, day=restart_time.day, second=0, microsecond=0)
+                for t in restart['times']:
+                    restart_time = utils.parse_time(t, tz=tz)
+                    check_time = datetime.now(tz=tz).replace(year=restart_time.year, month=restart_time.month,
+                                                             day=restart_time.day, second=0, microsecond=0)
                     if restart_time <= check_time:
                         restart_time += timedelta(days=1)
                     time_difference_in_seconds = int((restart_time - check_time).total_seconds())