Merge branch 'master' of https://github.com/thepeacockproject/Peacock

thepeacockproject · Aug 8, 2024 · fbb0968 · fbb0968
2 parents 4661061 + e4c36e7
commit fbb0968
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "v6", v* ]
+    branches: [ "v6", v*, "master" ]
   pull_request:
-    branches: [ "v6", v* ]
+    branches: [ "v6", v*, "master" ]
 
 jobs:
   analyze:

diff --git a/components/databaseHandler.ts b/components/databaseHandler.ts
@@ -220,6 +220,7 @@ export async function cheapLoadUserData(
         await loadUserData(userId, gameVersion)
     } catch (e) {
         log(LogLevel.DEBUG, "Unable to load profile information.")
+        log(LogLevel.DEBUG, e)
     }
 }
 

diff --git a/components/oauthToken.ts b/components/oauthToken.ts
@@ -216,6 +216,7 @@ export async function handleOAuthToken(
         await loadUserData(req.body.pId, gameVersion)
     } catch (e) {
         log(LogLevel.DEBUG, "Unable to load profile information.")
+        log(LogLevel.DEBUG, e)
     }
 
     /*

diff --git a/components/webFeatures.ts b/components/webFeatures.ts
@@ -498,11 +498,14 @@ webFeaturesRouter.post(
             userdata.Extensions.gamepersistentdata =
                 exts.data.Extensions.gamepersistentdata || {}
 
-            userdata.Extensions.gamepersistentdata.HitsFilterType ??= {
-                MyHistory: "all",
-                MyContracts: "all",
-                MyPlaylist: "all",
-            }
+            // @ts-expect-error It's fine
+            userdata.Extensions.gamepersistentdata.HitsFilterType ??= {}
+            userdata.Extensions.gamepersistentdata.HitsFilterType.MyHistory ??=
+                "all"
+            userdata.Extensions.gamepersistentdata.HitsFilterType.MyContracts ??=
+                "all"
+            userdata.Extensions.gamepersistentdata.HitsFilterType.MyPlaylist ??=
+                "all"
 
             const sublocations = getSublocations(req.query.gv)
             userdata.Extensions.defaultloadout ??= {}