UTC fixes

Author: karel26

plugins/greenieboard/commands.py

@@ -129,7 +129,9 @@ async def prune(self, conn: psycopg.AsyncConnection, *, days: int = -1, ucids: l
             for ucid in ucids:
                 await conn.execute('DELETE FROM traps WHERE player_ucid = %s', (ucid,))
         elif days > -1:
-            await conn.execute("DELETE FROM traps WHERE time < (DATE(NOW()) - %s::interval)", (f'{days} days', ))
+            await conn.execute("""
+                DELETE FROM traps WHERE time < (DATE(NOW() AT TIME ZONE 'UTC') - %s::interval)
+            """,(f'{days} days', ))
         self.log.debug('Greenieboard pruned.')
 
     async def update_ucid(self, conn: psycopg.AsyncConnection, old_ucid: str, new_ucid: str) -> None:

plugins/mission/commands.py

@@ -1622,10 +1622,10 @@ async def send_token(token: str):
                             token = str(random.randrange(1000, 9999))
                             await cursor.execute("""
                                 INSERT INTO players (ucid, discord_id, last_seen) 
-                                VALUES (%s, %s, NOW())
+                                VALUES (%s, %s, NOW() AT TIME ZONE 'UTC')
                             """, (token, interaction.user.id))
                             break
-                        except psycopg.DatabaseError:
+                        except psycopg.errors.UniqueViolation:
                             pass
             await send_token(token)
 

plugins/serverstats/serverstats.py

@@ -379,7 +379,7 @@ async def render(self, server_name: Optional[str], interval: Optional[str] = "1
                 SELECT 
                     s.player_ucid,
                     COUNT(DISTINCT DATE(s.hop_on)) AS days_present,
-                    CASE WHEN f.first_seen >= NOW() - INTERVAL '{interval}' THEN true ELSE false END AS is_new
+                    CASE WHEN f.first_seen >= (NOW() AT TIME ZONE 'UTC') - INTERVAL '{interval}' THEN true ELSE false END AS is_new
                 FROM 
                     statistics s
                     LEFT JOIN missions m ON s.mission_id = m.id
@@ -398,7 +398,7 @@ async def render(self, server_name: Optional[str], interval: Optional[str] = "1
             ),
             date_series AS (
                 SELECT generate_series(1, (
-                    SELECT DATE_PART('day', NOW() - (NOW() - INTERVAL '{interval}'))::INTEGER)
+                    SELECT DATE_PART('day', (NOW() AT TIME ZONE 'UTC') - ((NOW() AT TIME ZONE 'UTC') - INTERVAL '{interval}'))::INTEGER)
                 ) AS date
             )
             SELECT