From a4a3b6278acdc57c4b9b4942835cb1dfd34a9af8 Mon Sep 17 00:00:00 2001
From: AnthonyFuller <24512050+AnthonyFuller@users.noreply.github.com>
Date: Thu, 8 Aug 2024 02:03:41 +0100
Subject: [PATCH 1/4] Fix HitsFilterType when transferring progression

---
 components/webFeatures.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/webFeatures.ts b/components/webFeatures.ts
index 3720a4cc..73202887 100644
--- 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-ignore
+            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 ??= {}

From 437bfc9718db989f7ec5df99a131e8386d707245 Mon Sep 17 00:00:00 2001
From: AnthonyFuller <24512050+AnthonyFuller@users.noreply.github.com>
Date: Thu, 8 Aug 2024 06:23:05 +0100
Subject: [PATCH 2/4] Output error when loading userdata fails

---
 components/databaseHandler.ts | 1 +
 components/oauthToken.ts      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/components/databaseHandler.ts b/components/databaseHandler.ts
index 3f268fbf..c3d35e4d 100644
--- 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
index f6178898..e0760c90 100644
--- 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)
     }
 
     /*

From 3356a62867208902803ff9fd11ae4b17335b752b Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 8 Aug 2024 11:19:27 -0400
Subject: [PATCH 3/4] Fix the eslint error

---
 components/webFeatures.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/webFeatures.ts b/components/webFeatures.ts
index 73202887..fb774b5c 100644
--- a/components/webFeatures.ts
+++ b/components/webFeatures.ts
@@ -498,7 +498,7 @@ webFeaturesRouter.post(
             userdata.Extensions.gamepersistentdata =
                 exts.data.Extensions.gamepersistentdata || {}
 
-            // @ts-ignore
+            // @ts-expect-error It's fine
             userdata.Extensions.gamepersistentdata.HitsFilterType ??= {}
             userdata.Extensions.gamepersistentdata.HitsFilterType.MyHistory ??=
                 "all"

From e4c36e70484ae556f0f50925c059cd4ec7dce580 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 8 Aug 2024 11:20:03 -0400
Subject: [PATCH 4/4] Run codeql against master

---
 .github/workflows/codeql.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 380f0fc5..4c2f6b2c 100644
--- 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: