Merge branch 'achievements' into staging

2022-01-28 17:20:52 +02:00
parent 50f6e8928f 08935c08e7
commit 4fc1494a8f
7 changed files with 582 additions and 4 deletions
--- a/data/schema.sql
+++ b/data/schema.sql
@@ -486,7 +486,7 @@ AS $$
          (start_time + duration * interval '1 second') AS end_time
        FROM session_history
        WHERE
-          guildid=_guildid
+          (_guildid IS NULL OR guildid=_guildid)
          AND userid=_userid
          AND (start_time + duration * interval '1 second') >= _timestamp
        UNION
@@ -496,7 +496,7 @@ AS $$
          NOW() AS end_time
        FROM current_sessions
        WHERE
-          guildid=_guildid
+          (_guildid IS NULL OR guildid=_guildid)
          AND userid=_userid
      ) AS sessions
    );