From b00fbee7bd147f825e35a3de4c0b9aeedadac493 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Fri, 19 Jan 2024 15:11:02 +0100
Subject: [PATCH 1/3] refactor: Pass launch options via object

Currently object only has a single member for bypassing all checks.
In the future this would be split up into multiple members for different checks to bypass as well as other options.
---
 src-vue/src/plugins/store.ts        | 9 ++++++++-
 src-vue/src/utils/LaunchOptions.ts  | 3 +++
 src-vue/src/views/DeveloperView.vue | 4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src-vue/src/utils/LaunchOptions.ts

diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index a1a67e2b8..f2f772df3 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -6,6 +6,7 @@ import { invoke } from "@tauri-apps/api";
 import { GameInstall } from "../utils/GameInstall";
 import { ReleaseCanal } from "../utils/ReleaseCanal";
 import { FlightCoreVersion } from "../../../src-tauri/bindings/FlightCoreVersion";
+import { LaunchOptions } from "../utils/LaunchOptions";
 import { NotificationHandle } from 'element-plus';
 import { NorthstarState } from '../utils/NorthstarState';
 import { appDir } from '@tauri-apps/api/path';
@@ -172,7 +173,13 @@ export const store = createStore<FlightCoreStore>({
                 }
             }
         },
-        async launchGame(state: any, no_checks = false) {
+        async launchGame(state: any, launch_options: LaunchOptions | null = null) {
+            let no_checks = false;
+
+            if (launch_options != null) {
+                no_checks = launch_options.no_checks;
+            }
+
             if (no_checks) {
                 await invoke("launch_northstar", { gameInstall: state.game_install, bypassChecks: no_checks })
                     .then((message) => {
diff --git a/src-vue/src/utils/LaunchOptions.ts b/src-vue/src/utils/LaunchOptions.ts
new file mode 100644
index 000000000..801dfaf97
--- /dev/null
+++ b/src-vue/src/utils/LaunchOptions.ts
@@ -0,0 +1,3 @@
+export interface LaunchOptions {
+    no_checks: boolean,
+}
diff --git a/src-vue/src/views/DeveloperView.vue b/src-vue/src/views/DeveloperView.vue
index aa586e6ee..5e835b3e5 100644
--- a/src-vue/src/views/DeveloperView.vue
+++ b/src-vue/src/views/DeveloperView.vue
@@ -136,6 +136,7 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 import { invoke } from "@tauri-apps/api";
+import { LaunchOptions } from "../utils/LaunchOptions";
 import { TagWrapper } from "../../../src-tauri/bindings/TagWrapper";
 import { NorthstarThunderstoreReleaseWrapper } from "../../../src-tauri/bindings/NorthstarThunderstoreReleaseWrapper";
 import PullRequestsSelector from "../components/PullRequestsSelector.vue";
@@ -206,7 +207,8 @@ export default defineComponent({
                 });
         },
         async launchGameWithoutChecks() {
-            this.$store.commit('launchGame', true);
+            let launch_options: LaunchOptions = { no_checks: true };
+            this.$store.commit('launchGame', launch_options);
         },
         async launchGameViaSteam() {
             this.$store.commit('launchGameSteam', true);

From c5336ec53952865af3f624a20a5c650598f2461b Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Tue, 13 Feb 2024 00:53:40 +0100
Subject: [PATCH 2/3] refactor: Re-use binding created from Rust code

---
 src-vue/src/plugins/store.ts        | 20 ++------------------
 src-vue/src/views/DeveloperView.vue |  7 ++++---
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index e858af009..1950babba 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -6,7 +6,6 @@ import { invoke } from "@tauri-apps/api";
 import { GameInstall } from "../utils/GameInstall";
 import { ReleaseCanal } from "../utils/ReleaseCanal";
 import { FlightCoreVersion } from "../../../src-tauri/bindings/FlightCoreVersion";
-import { LaunchOptions } from "../utils/LaunchOptions";
 import { NotificationHandle } from 'element-plus';
 import { NorthstarState } from '../utils/NorthstarState';
 import { appDir } from '@tauri-apps/api/path';
@@ -174,18 +173,7 @@ export const store = createStore<FlightCoreStore>({
                 }
             }
         },
-        async launchGame(state: any, passed_launch_options: LaunchOptions | null = null) {
-            let no_checks = false;
-
-            if (passed_launch_options != null) {
-                no_checks = passed_launch_options.no_checks;
-            }
-
-            const launch_options: NorthstarLaunchOptions = {
-                launch_via_steam: false,
-                bypass_checks: no_checks,
-            };
-
+        async launchGame(state: any, launch_options: NorthstarLaunchOptions = { launch_via_steam: false, bypass_checks: false}) {
 
             if (launch_options.bypass_checks) {
                 await invoke("launch_northstar", { gameInstall: state.game_install, launchOptions: launch_options })
@@ -254,11 +242,7 @@ export const store = createStore<FlightCoreStore>({
                     break;
             }
         },
-        async launchGameSteam(state: any, no_checks = false) {
-            const launch_options: NorthstarLaunchOptions = {
-                launch_via_steam: true,
-                bypass_checks: false,
-            };
+        async launchGameSteam(state: any, launch_options: NorthstarLaunchOptions = { launch_via_steam: true, bypass_checks: false}) {
             await invoke("launch_northstar", { gameInstall: state.game_install, launchOptions: launch_options })
                 .then((message) => {
                     showNotification('Success');
diff --git a/src-vue/src/views/DeveloperView.vue b/src-vue/src/views/DeveloperView.vue
index 869de2f84..1df249d33 100644
--- a/src-vue/src/views/DeveloperView.vue
+++ b/src-vue/src/views/DeveloperView.vue
@@ -149,7 +149,7 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 import { invoke } from "@tauri-apps/api";
-import { LaunchOptions } from "../utils/LaunchOptions";
+import { NorthstarLaunchOptions } from "../../../src-tauri/bindings/NorthstarLaunchOptions";
 import { TagWrapper } from "../../../src-tauri/bindings/TagWrapper";
 import { NorthstarThunderstoreReleaseWrapper } from "../../../src-tauri/bindings/NorthstarThunderstoreReleaseWrapper";
 import PullRequestsSelector from "../components/PullRequestsSelector.vue";
@@ -221,11 +221,12 @@ export default defineComponent({
                 });
         },
         async launchGameWithoutChecks() {
-            let launch_options: LaunchOptions = { no_checks: true };
+            let launch_options: NorthstarLaunchOptions = { bypass_checks: true, launch_via_steam: false };
             this.$store.commit('launchGame', launch_options);
         },
         async launchGameViaSteam() {
-            this.$store.commit('launchGameSteam', true);
+            let launch_options: NorthstarLaunchOptions = { bypass_checks: false, launch_via_steam: true };
+            this.$store.commit('launchGameSteam', launch_options);
         },
         async getInstalledMods() {
             await invoke("get_installed_mods_and_properties", { gameInstall: this.$store.state.game_install }).then((message) => {

From 2f2d7f908adc89009d4d2aaf04b8d58241071a52 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Tue, 13 Feb 2024 00:54:04 +0100
Subject: [PATCH 3/3] fix: Remove unused interface

---
 src-vue/src/utils/LaunchOptions.ts | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 src-vue/src/utils/LaunchOptions.ts

diff --git a/src-vue/src/utils/LaunchOptions.ts b/src-vue/src/utils/LaunchOptions.ts
deleted file mode 100644
index 801dfaf97..000000000
--- a/src-vue/src/utils/LaunchOptions.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface LaunchOptions {
-    no_checks: boolean,
-}