From 8d9dc830476170d01f94fe4dc6967b3d4ecdbab0 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Wed, 4 Jan 2023 11:50:52 +0100
Subject: refactor: Deserialize into struct directly (#127)

Instead of deserializing into a generic serde struct and then extracting
specific value from it, deserialize directly into the struct we want.
---
 src-tauri/src/github/release_notes.rs | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src-tauri/src/github/release_notes.rs b/src-tauri/src/github/release_notes.rs
index f139ead5..803132e2 100644
--- a/src-tauri/src/github/release_notes.rs
+++ b/src-tauri/src/github/release_notes.rs
@@ -91,28 +91,9 @@ pub async fn get_northstar_release_notes() -> Result<Vec<ReleaseInfo>, String> {
     let url = "https://api.github.com/repos/R2Northstar/Northstar/releases";
     let res = fetch_github_releases_api(url).await?;
 
-    let json_response: Vec<serde_json::Value> =
+    let release_info_vector: Vec<ReleaseInfo> =
         serde_json::from_str(&res).expect("JSON was not well-formatted");
     println!("Done checking GitHub API");
 
-    return Ok(json_response
-        .iter()
-        .map(|release| ReleaseInfo {
-            name: release
-                .get("name")
-                .and_then(|value| value.as_str())
-                .unwrap()
-                .to_string(),
-            published_at: release
-                .get("published_at")
-                .and_then(|value| value.as_str())
-                .unwrap()
-                .to_string(),
-            body: release
-                .get("body")
-                .and_then(|value| value.as_str())
-                .unwrap()
-                .to_string(),
-        })
-        .collect());
+    return Ok(release_info_vector);
 }
-- 
cgit v1.2.3


From 6bfc6996e12ba201f52de586c67f3db4a97bc722 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Wed, 4 Jan 2023 19:12:53 +0100
Subject: feat: Show newest version number (#124)

* refactor: Move getting new FC version to own func

* refactor: Deserialize into object

* refactor: Return whole object instead of 2 strings

More readable

* refactor: Rename variable

* refactor: Use fields of object directly
instead of assigning to variables first

* feat: Expose backend func to get newest FC version
and then call it to get newest version number if current is outdated.

This way we can display to the user how far behind their currently
installed version is.
---
 src-tauri/src/github/release_notes.rs    | 38 +++++++++++++++++---------------
 src-tauri/src/main.rs                    |  5 ++++-
 src-vue/src/plugins/store.ts             |  4 +++-
 src-vue/src/utils/FlightCoreVersion.d.ts |  5 +++++
 4 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 src-vue/src/utils/FlightCoreVersion.d.ts

diff --git a/src-tauri/src/github/release_notes.rs b/src-tauri/src/github/release_notes.rs
index 803132e2..a1d174fa 100644
--- a/src-tauri/src/github/release_notes.rs
+++ b/src-tauri/src/github/release_notes.rs
@@ -8,6 +8,12 @@ pub struct ReleaseInfo {
     pub body: String,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct FlightCoreVersion {
+    tag_name: String,
+    published_at: String,
+}
+
 // Fetches repo release API and returns response as string
 async fn fetch_github_releases_api(url: &str) -> Result<String, String> {
     println!("Fetching releases notes from GitHub API");
@@ -27,24 +33,26 @@ async fn fetch_github_releases_api(url: &str) -> Result<String, String> {
     Ok(res)
 }
 
-/// Checks if installed FlightCore version is up-to-date
-/// false -> FlightCore install is up-to-date
-/// true  -> FlightCore install is outdated
-pub async fn check_is_flightcore_outdated() -> Result<bool, String> {
+/// Gets newest FlighCore version from GitHub
+#[tauri::command]
+pub async fn get_newest_flightcore_version() -> Result<FlightCoreVersion, String> {
     // Get newest version number from GitHub API
     println!("Checking GitHub API");
     let url = "https://api.github.com/repos/R2NorthstarTools/FlightCore/releases/latest";
     let res = fetch_github_releases_api(url).await?;
 
-    let json_response: serde_json::Value =
+    let flightcore_version: FlightCoreVersion =
         serde_json::from_str(&res).expect("JSON was not well-formatted");
     println!("Done checking GitHub API");
 
-    // Extract version number from JSON
-    let newest_release_version = json_response
-        .get("tag_name")
-        .and_then(|value| value.as_str())
-        .unwrap();
+    Ok(flightcore_version)
+}
+
+/// Checks if installed FlightCore version is up-to-date
+/// false -> FlightCore install is up-to-date
+/// true  -> FlightCore install is outdated
+pub async fn check_is_flightcore_outdated() -> Result<bool, String> {
+    let newest_flightcore_release = get_newest_flightcore_version().await?;
 
     // Get version of installed FlightCore...
     let version = env!("CARGO_PKG_VERSION");
@@ -52,16 +60,10 @@ pub async fn check_is_flightcore_outdated() -> Result<bool, String> {
     let version = format!("v{}", version);
 
     // TODO: This shouldn't be a string compare but promper semver compare
-    let is_outdated = version != newest_release_version;
+    let is_outdated = version != newest_flightcore_release.tag_name;
 
     // If outdated, check how new the update is
     if is_outdated {
-        // Extract release date from JSON
-        let release_date = json_response
-            .get("published_at")
-            .and_then(|value| value.as_str())
-            .unwrap();
-
         // Time to wait (2h)    h *  m *  s
         let threshold_seconds = 2 * 60 * 60;
 
@@ -69,7 +71,7 @@ pub async fn check_is_flightcore_outdated() -> Result<bool, String> {
         let current_time = chrono::Utc::now();
 
         // Get latest release time from GitHub API response
-        let result = chrono::DateTime::parse_from_rfc3339(release_date)
+        let result = chrono::DateTime::parse_from_rfc3339(&newest_flightcore_release.published_at)
             .unwrap()
             .with_timezone(&chrono::Utc);
 
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index e8912d60..7d08e72e 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -12,7 +12,9 @@ use std::{
 use app::*;
 
 mod github;
-use github::release_notes::{check_is_flightcore_outdated, get_northstar_release_notes};
+use github::release_notes::{
+    check_is_flightcore_outdated, get_newest_flightcore_version, get_northstar_release_notes,
+};
 
 mod repair_and_verify;
 use repair_and_verify::{
@@ -101,6 +103,7 @@ fn main() {
             get_installed_mods_caller,
             install_mod_caller,
             clean_up_download_folder_caller,
+            get_newest_flightcore_version,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index c22479e0..3db85e64 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -5,6 +5,7 @@ import { InstallType } from "../utils/InstallType";
 import { invoke } from "@tauri-apps/api";
 import { GameInstall } from "../utils/GameInstall";
 import { ReleaseCanal } from "../utils/ReleaseCanal";
+import { FlightCoreVersion } from "../utils/FlightCoreVersion";
 import { ElNotification, NotificationHandle } from 'element-plus';
 import { NorthstarState } from '../utils/NorthstarState';
 import { appDir } from '@tauri-apps/api/path';
@@ -377,9 +378,10 @@ async function _checkForFlightCoreUpdates(state: FlightCoreStore) {
     let flightcore_is_outdated = await invoke("check_is_flightcore_outdated_caller") as boolean;
 
     if (flightcore_is_outdated) {
+        let newest_flightcore_version = await invoke("get_newest_flightcore_version") as FlightCoreVersion;
         ElNotification({
             title: 'FlightCore outdated!',
-            message: `Please update FlightCore. Running outdated version ${state.flightcore_version}`,
+            message: `Please update FlightCore.\nRunning outdated version ${state.flightcore_version}.\nNewest is ${newest_flightcore_version.tag_name}!`,
             type: 'warning',
             position: 'bottom-right',
             duration: 0 // Duration `0` means the notification will not auto-vanish
diff --git a/src-vue/src/utils/FlightCoreVersion.d.ts b/src-vue/src/utils/FlightCoreVersion.d.ts
new file mode 100644
index 00000000..2516bf25
--- /dev/null
+++ b/src-vue/src/utils/FlightCoreVersion.d.ts
@@ -0,0 +1,5 @@
+// derived from release_notes.rs
+export interface FlightCoreVersion {
+    tag_name: string,
+    published_at: string,
+}
-- 
cgit v1.2.3


From 131b101045bbc4419f98afe58557a8d532af9bd6 Mon Sep 17 00:00:00 2001
From: Rémy Raes <contact@remyraes.com>
Date: Wed, 4 Jan 2023 19:21:17 +0100
Subject: feat: Thunderstore mods pagination (#122)

* feat: add basic pagination

* refactor: put paginator inside filters container

* fix: limit filter container width

* refactor: filters container is now responsive

* fix: add missing type to pagination listener parameter

* fix: don't display entire mods list while filtering mods

* refactor: filteredMods is now a computed value

* refactor: store mods per page value on UI store

* feat: user can change modsPerPage count in settings

* fix: limit mods count (min=5, max=100)

* feat: add control on pages value

When leaving settings vue, we check if the pages value is a number and is
included in the interval [5-100].
If that's not the case, we reset it to 20.

* feat: retrieve and save pages value in persistent store

* fix: don't load an empty value from persistent store on boot

* fix: cast modsPerPage to string to check if it's empty

* refactor: remove search debounce

* Update src-vue/src/plugins/store.ts

* style: add trailing comma

* fix: mention impact on TS mods only

* refactor: remove limitations on modsPerPage

* style: explicitly cast mods_per_page to number

* feat: disable pagination with modsPerPage === 0

* feat: add pagination under thunderstore mod cards

* fix: adjust bottom pagination padding

* feat: clicking bottom pagination scrolls to page top

* fix: use same containers for both paginations

* feat: do not display pagination if mods fit on one page

* style: trailing spaces

* style: trailing spaces

* feat: add a button to reset modsPerPage

* feat: add explanation text about disabling pagination
---
 src-vue/src/plugins/store.ts               |  15 ++-
 src-vue/src/views/SettingsView.vue         |  48 +++++++++
 src-vue/src/views/ThunderstoreModsView.vue | 158 +++++++++++++++++++----------
 3 files changed, 167 insertions(+), 54 deletions(-)

diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index 3db85e64..18191555 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -36,7 +36,10 @@ export interface FlightCoreStore {
     installed_mods: NorthstarMod[],
 
     northstar_is_running: boolean,
-    origin_is_running: boolean
+    origin_is_running: boolean,
+
+    // user custom settings
+    mods_per_page: number,
 }
 
 let notification_handle: NotificationHandle;
@@ -60,7 +63,9 @@ export const store = createStore<FlightCoreStore>({
             installed_mods: [],
 
             northstar_is_running: false,
-            origin_is_running: false
+            origin_is_running: false,
+
+            mods_per_page: 20,
         }
     },
     mutations: {
@@ -320,6 +325,12 @@ async function _initializeApp(state: any) {
         state.enableReleasesSwitch = valueFromStore.value;
     }
 
+    // Grab "Thunderstore mods per page" setting from store if possible
+    const perPageFromStore: {value: number} | null = await persistentStore.get('thunderstore-mods-per-page');
+    if (perPageFromStore && perPageFromStore.value) {
+        state.mods_per_page = perPageFromStore.value;
+    }
+
     // Get FlightCore version number
     state.flightcore_version = await invoke("get_flightcore_version_number");
 
diff --git a/src-vue/src/views/SettingsView.vue b/src-vue/src/views/SettingsView.vue
index ff87c394..1c03fe4f 100644
--- a/src-vue/src/views/SettingsView.vue
+++ b/src-vue/src/views/SettingsView.vue
@@ -14,6 +14,24 @@
                         <el-button icon="Folder" @click="updateGamePath"/>
                     </template>
                 </el-input>
+
+                <!-- Thunderstore mods per page configuration -->
+                <div class="fc_parameter__panel">
+                    <h3>Number of Thunderstore mods per page</h3>
+                    <h6>
+                        This has an impact on display performances when browsing Thunderstore mods.<br>
+                        Set this value to 0 to disable pagination.
+                    </h6>
+                    <el-input 
+                        v-model="modsPerPage" 
+                        type="number"
+                    >
+                        <template #append>
+                            <el-button @click="modsPerPage = 20">Reset to default</el-button>
+                        </template>
+                    </el-input>
+                </div>
+
                 <h3>About:</h3>
                 <div class="fc_northstar__version" @click="activateDeveloperMode">
                     FlightCore Version: {{ flightcoreVersion === '' ? 'Unknown version' : `${flightcoreVersion}` }}
@@ -64,6 +82,15 @@ export default defineComponent({
                     this.$store.commit('toggleReleaseCandidate');
                 }
             }
+        },
+        modsPerPage: {
+            get(): number {
+                return this.$store.state.mods_per_page;
+            },
+            set(value: number) {
+                this.$store.state.mods_per_page = value;
+                persistentStore.set('thunderstore-mods-per-page', { value });
+            }
         }
     },
     methods: {
@@ -86,6 +113,12 @@ export default defineComponent({
     },
     mounted() {
         document.querySelector('input')!.disabled = true;
+    },
+    unmounted() {
+        if (('' + this.modsPerPage) === '') {
+            console.warn('Incorrect value for modsPerPage, resetting it to 20.');
+            this.modsPerPage = 20;
+        }
     }
 });
 </script>
@@ -110,4 +143,19 @@ h3:first-of-type {
 .el-switch {
     margin-left: 50px;
 }
+
+
+/* Parameter panel styles */
+.fc_parameter__panel {
+    margin: 30px 0;
+}
+
+.fc_parameter__panel h3 {
+    margin-bottom: 5px;
+}
+
+.fc_parameter__panel h6 {
+    margin-top: 0;
+    margin-bottom: 12px;
+}
 </style>
diff --git a/src-vue/src/views/ThunderstoreModsView.vue b/src-vue/src/views/ThunderstoreModsView.vue
index 5b74bd1c..5733d30b 100644
--- a/src-vue/src/views/ThunderstoreModsView.vue
+++ b/src-vue/src/views/ThunderstoreModsView.vue
@@ -3,7 +3,7 @@
         <div v-if="mods.length === 0" class="fc__changelog__container">
             <el-progress :show-text="false" :percentage="50" :indeterminate="true" />
         </div>
-        <el-scrollbar v-else class="container">
+        <el-scrollbar v-else class="container" ref="scrollbar">
             <div class="card-container">
                 <!-- Search filters -->
                 <div class="filter_container">
@@ -12,6 +12,16 @@
                     <div v-if="userIsTyping" class="modMessage search">
                         Searching mods...
                     </div>
+
+                    <!-- Pagination -->
+                    <el-pagination
+                        v-if="shouldDisplayPagination"
+                        :currentPage="currentPageIndex + 1"
+                        layout="prev, pager, next"
+                        :page-size="modsPerPage"
+                        :total="modsList.length"
+                        @current-change="(e: number) => currentPageIndex = e - 1"
+                    />
                 </div>
 
                 <!-- Message displayed if no mod matched searched words -->
@@ -21,16 +31,32 @@
                 </div>
 
                 <!-- Mod cards -->
-                <thunderstore-mod-card v-for="mod of modsList" v-bind:key="mod.name" :mod="mod" />
+                <thunderstore-mod-card v-for="mod of currentPageMods" v-bind:key="mod.name" :mod="mod" />
+            </div>
+
+            <!-- Bottom pagination -->
+            <div class="card-container">
+                <div class="filter_container">
+                    <el-pagination
+                        class="fc_bottom__pagination"
+                        v-if="shouldDisplayPagination"
+                        :currentPage="currentPageIndex + 1"
+                        layout="prev, pager, next"
+                        :page-size="modsPerPage"
+                        :total="modsList.length"
+                        @current-change="onBottomPaginationChange"
+                    />
+                </div>
             </div>
         </el-scrollbar>
     </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, ref } from 'vue';
 import { ThunderstoreMod } from "../utils/thunderstore/ThunderstoreMod";
 import ThunderstoreModCard from "../components/ThunderstoreModCard.vue";
+import { ElScrollbar, ScrollbarInstance } from "element-plus";
 
 export default defineComponent({
     name: "ThunderstoreModsView",
@@ -42,68 +68,69 @@ export default defineComponent({
         mods(): ThunderstoreMod[] {
             return this.$store.state.thunderstoreMods;
         },
+        filteredMods(): ThunderstoreMod[] {
+            if (this.searchValue.length === 0) {
+                return this.mods;
+            }
+
+            return this.mods.filter((mod: ThunderstoreMod) => {
+                return mod.name.toLowerCase().includes(this.searchValue)
+                    || mod.owner.toLowerCase().includes(this.searchValue)
+                    || mod.versions[0].description.toLowerCase().includes(this.searchValue);
+            });
+        },
         modsList(): ThunderstoreMod[] {
-            return this.input.length === 0 || this.userIsTyping ? this.mods : this.filteredMods;
+            return this.input.length !== 0 || this.userIsTyping ? this.filteredMods : this.mods;
+        },
+        modsPerPage(): number {
+            return parseInt(this.$store.state.mods_per_page);
+        },
+        currentPageMods(): ThunderstoreMod[] {
+            // User might want to display all mods on one page.
+            const perPageValue = this.modsPerPage != 0 ? this.modsPerPage : this.modsList.length;
+
+            const startIndex = this.currentPageIndex * perPageValue;
+            const endIndexCandidate = startIndex + perPageValue;
+            const endIndex =  endIndexCandidate > this.modsList.length ? this.modsList.length : endIndexCandidate;
+            return this.modsList.slice(startIndex, endIndex);
+        },
+        shouldDisplayPagination(): boolean {
+            return this.modsPerPage != 0 && this.modsList.length > this.modsPerPage;
         }
     },
     data() {
         return {
+            // This is the model for the search input.
             input: '',
-            filteredMods: [] as ThunderstoreMod[],
+            // This is the treated value of search input
+            searchValue: '',
+
             modsBeingInstalled: [] as string[],
             userIsTyping: false,
-            debouncedSearch: this.debounce((i: string) => this.filterMods(i))
+
+            currentPageIndex: 0
         };
     },
     methods: {
-        /**
-         * This is a debounced version of the filterMods method, that calls
-         * filterMods when user has stopped typing in the search bar (i.e.
-         * waits 300ms).
-         * It allows not to trigger filtering method (which is costly) each
-         * time user inputs a character.
-         */
-        onFilterTextChange (searchString: string) {
-            this.debouncedSearch(searchString);
-        },
-
         /**
          * This method is called each time search input is modified, and
-         * filters mods matching the input string.
+         * triggered filtered mods recomputing by updating the `searchValue`
+         * variable.
          *
          * This converts research string and all researched fields to
          * lower case, to match mods regardless of font case.
          */
-        filterMods(value: string) {
-            if (value === '') {
-                this.filteredMods = [];
-                return;
-            }
-
-            const searchValue = value.toLowerCase();
-
-            this.filteredMods = this.mods.filter((mod: ThunderstoreMod) => {
-                return mod.name.toLowerCase().includes(searchValue)
-                    || mod.owner.toLowerCase().includes(searchValue)
-                    || mod.versions[0].description.toLowerCase().includes(searchValue);
-            });
+         onFilterTextChange(value: string) {
+            this.currentPageIndex = 0;
+            this.searchValue = value.toLowerCase();
         },
 
         /**
-         * This debounces a method, i.e. it prevents input method from being called
-         * multiple times in a short period of time.
-         * Stolen from https://www.freecodecamp.org/news/javascript-debounce-example/
+         * This updates current pagination and scrolls view to the top.
          */
-        debounce (func: Function, timeout = 200) {
-            let timer: any;
-            return (...args: any) => {
-                this.userIsTyping = true;
-                clearTimeout(timer);
-                timer = setTimeout(() => {
-                    this.userIsTyping = false;
-                    func.apply(this, args);
-                }, timeout);
-            };
+        onBottomPaginationChange(index: number) {
+            this.currentPageIndex = index - 1;
+            (this.$refs.scrollbar as ScrollbarInstance).scrollTo({ top: 0, behavior: 'smooth' });
         }
     }
 });
@@ -119,14 +146,6 @@ export default defineComponent({
     user-select: none !important;
 }
 
-.filter_container {
-    margin: 5px;
-}
-
-.el-input {
-    max-width: 300px;
-}
-
 .search {
     display: inline-block;
     margin: 0 0 0 10px !important;
@@ -141,6 +160,11 @@ export default defineComponent({
     margin: 0 auto;
 }
 
+.fc_bottom__pagination {
+    padding-bottom: 20px !important;
+    padding-right: 10px;
+}
+
 /* Card container dynamic size */
 @media (max-width: 1000px) {
     .card-container {
@@ -152,6 +176,11 @@ export default defineComponent({
     .card-container {
         width: 574px;
     }
+
+    .el-pagination {
+        float: none;
+        margin-top: 5px;
+    }
 }
 
 @media (max-width: 624px) {
@@ -160,10 +189,35 @@ export default defineComponent({
     }
 }
 
+.filter_container {
+    margin-bottom: 10px;
+}
+
+.el-input {
+    max-width: 200px;
+}
+
+@media (min-width: 812px) {
+    .filter_container {
+        margin: 5px auto;
+        padding: 0 5px;
+        max-width: 1000px;
+    }
+
+    .el-pagination {
+        float: right;
+        margin: 0;
+    }
+}
+
 @media (min-width: 1000px) {
     .card-container {
         width: 940px;
     }
+
+    .el-input {
+        max-width: 300px;
+    }
 }
 
 @media (min-width: 1188px) {
-- 
cgit v1.2.3


From 4a63e92ea30fc65cf945b163d2757f17dd3c68cd Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Wed, 4 Jan 2023 20:58:54 +0100
Subject: refactor: Remove unnecessary caller function pattern (#128)

* refactor: Remove unnecessary caller function

Instead call `disable_all_but_core` directly

* refactor: Remove unnecessary caller function

Instead call `get_installed_mods_and_properties` directly

* refactor: Remove unused exposed backend function

* refactor: Remove unnecessary caller function

Instead call `set_mod_enabled_status` directly

* refactor: Remove unnecessary caller function

Instead call `verify_game_files` directly

* refactor: Remove unnecessary caller function

Instead call `get_log_list` directly
---
 src-tauri/src/main.rs                  | 48 ++++------------------------------
 src-tauri/src/mod_management/mod.rs    |  2 ++
 src-tauri/src/repair_and_verify/mod.rs |  4 +++
 src-vue/src/plugins/store.ts           |  2 +-
 src-vue/src/views/DeveloperView.vue    |  4 +--
 src-vue/src/views/ModsView.vue         |  2 +-
 6 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 7d08e72e..0d7e69af 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -92,15 +92,14 @@ fn main() {
             update_northstar_caller,
             launch_northstar_caller,
             check_is_flightcore_outdated_caller,
-            get_log_list_caller,
-            verify_game_files_caller,
-            get_enabled_mods_caller,
-            set_mod_enabled_status_caller,
-            disable_all_but_core_caller,
+            get_log_list,
+            verify_game_files,
+            set_mod_enabled_status,
+            disable_all_but_core,
             is_debug_mode,
             get_northstar_release_notes,
             linux_checks,
-            get_installed_mods_caller,
+            get_installed_mods_and_properties,
             install_mod_caller,
             clean_up_download_folder_caller,
             get_newest_flightcore_version,
@@ -276,43 +275,6 @@ async fn launch_northstar_caller(
     launch_northstar(game_install, bypass_checks)
 }
 
-#[tauri::command]
-/// Get list of Northstar logs
-async fn get_log_list_caller(game_install: GameInstall) -> Result<Vec<std::path::PathBuf>, String> {
-    get_log_list(game_install)
-}
-
-#[tauri::command]
-async fn verify_game_files_caller(game_install: GameInstall) -> Result<String, String> {
-    verify_game_files(game_install)
-}
-
-#[tauri::command]
-async fn get_enabled_mods_caller(
-    game_install: GameInstall,
-) -> Result<serde_json::value::Value, String> {
-    get_enabled_mods(game_install)
-}
-
-#[tauri::command]
-async fn set_mod_enabled_status_caller(
-    game_install: GameInstall,
-    mod_name: String,
-    is_enabled: bool,
-) -> Result<(), String> {
-    set_mod_enabled_status(game_install, mod_name, is_enabled)
-}
-
-#[tauri::command]
-async fn disable_all_but_core_caller(game_install: GameInstall) -> Result<(), String> {
-    disable_all_but_core(game_install)
-}
-
-#[tauri::command]
-async fn get_installed_mods_caller(game_install: GameInstall) -> Result<Vec<NorthstarMod>, String> {
-    get_installed_mods_and_properties(game_install)
-}
-
 #[tauri::command]
 /// Installs the specified mod
 async fn install_mod_caller(
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index 4fa52127..4fe1b517 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -43,6 +43,7 @@ pub fn rebuild_enabled_mods_json(game_install: GameInstall) -> Result<(), String
 }
 
 /// Set the status of a passed mod to enabled/disabled
+#[tauri::command]
 pub fn set_mod_enabled_status(
     game_install: GameInstall,
     mod_name: String,
@@ -185,6 +186,7 @@ fn parse_installed_mods(game_install: GameInstall) -> Result<Vec<NorthstarMod>,
 /// Gets list of installed mods and their properties
 /// - name
 /// - is enabled?
+#[tauri::command]
 pub fn get_installed_mods_and_properties(
     game_install: GameInstall,
 ) -> Result<Vec<NorthstarMod>, String> {
diff --git a/src-tauri/src/repair_and_verify/mod.rs b/src-tauri/src/repair_and_verify/mod.rs
index 64278a25..393a8cdd 100644
--- a/src-tauri/src/repair_and_verify/mod.rs
+++ b/src-tauri/src/repair_and_verify/mod.rs
@@ -4,6 +4,7 @@ use anyhow::anyhow;
 use app::{get_enabled_mods, GameInstall};
 
 /// Verifies Titanfall2 game files
+#[tauri::command]
 pub fn verify_game_files(game_install: GameInstall) -> Result<String, String> {
     dbg!(game_install);
     Err("TODO, not yet implemented".to_string())
@@ -11,6 +12,7 @@ pub fn verify_game_files(game_install: GameInstall) -> Result<String, String> {
 
 /// Disables all mods except core ones
 /// Enables core mods if disabled
+#[tauri::command]
 pub fn disable_all_but_core(game_install: GameInstall) -> Result<(), String> {
 
     // Rebuild `enabledmods.json` first to ensure all mods are added
@@ -62,6 +64,8 @@ pub fn clean_up_download_folder(
     Ok(())
 }
 
+/// Get list of Northstar logs
+#[tauri::command]
 pub fn get_log_list(game_install: GameInstall) -> Result<Vec<std::path::PathBuf>, String> {
     let ns_log_folder = format!("{}/R2Northstar/logs", game_install.game_path);
 
diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index 18191555..ee4af283 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -252,7 +252,7 @@ export const store = createStore<FlightCoreStore>({
             }
 
             // Call back-end for installed mods
-            await invoke("get_installed_mods_caller", { gameInstall: game_install })
+            await invoke("get_installed_mods_and_properties", { gameInstall: game_install })
                 .then((message) => {
                     state.installed_mods = (message as NorthstarMod[]);
                 })
diff --git a/src-vue/src/views/DeveloperView.vue b/src-vue/src/views/DeveloperView.vue
index 9f8881d8..f199ddaf 100644
--- a/src-vue/src/views/DeveloperView.vue
+++ b/src-vue/src/views/DeveloperView.vue
@@ -111,7 +111,7 @@ export default defineComponent({
                 game_path: this.$store.state.game_path,
                 install_type: this.$store.state.install_type
             } as GameInstall;
-            await invoke("disable_all_but_core_caller", { gameInstall: game_install }).then((message) => {
+            await invoke("disable_all_but_core", { gameInstall: game_install }).then((message) => {
                 ElNotification({
                     title: 'Success',
                     message: "Disabled all mods but core",
@@ -133,7 +133,7 @@ export default defineComponent({
                 game_path: this.$store.state.game_path,
                 install_type: this.$store.state.install_type
             } as GameInstall;
-            await invoke("get_installed_mods_caller", { gameInstall: game_install }).then((message) => {
+            await invoke("get_installed_mods_and_properties", { gameInstall: game_install }).then((message) => {
                 // Simply console logging for now
                 // In the future we should display the installed mods somewhere
                 console.log(message);
diff --git a/src-vue/src/views/ModsView.vue b/src-vue/src/views/ModsView.vue
index b1d1aeff..af3b58a3 100644
--- a/src-vue/src/views/ModsView.vue
+++ b/src-vue/src/views/ModsView.vue
@@ -48,7 +48,7 @@ export default defineComponent({
 
             // enable/disable specific mod
             try {
-                await invoke("set_mod_enabled_status_caller", {
+                await invoke("set_mod_enabled_status", {
                     gameInstall: game_install,
                     modName: mod.name,
                     // Need to set it to the opposite of current state,
-- 
cgit v1.2.3


From 4951a7e9048b6538a72294184639f6590f78384e Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Wed, 4 Jan 2023 23:42:05 +0100
Subject: feat: Add button to delete Northstar mod (#110)

* feat: Expose installed NS mod directory

This allows other functions to get a mod directory directly which is
useful for e.g. deleting a mod.

* feat: Add button to delete Northstar mod

* refactor: Return vector of NorthstarMod
instead of unnamed Tuples

* refactor: Remove leftover print statement

* chore: Remove leftover todo comment

* feat: Show confirm warning before deleting mod

* refactor: Call func directly instead of proxy

Removes the `func_caller` pattern

* fix: Call reloading mods after attempted delete
---
 src-tauri/src/main.rs               |  3 ++-
 src-tauri/src/mod_management/mod.rs | 45 +++++++++++++++++++++++++++++++++++++
 src-vue/src/views/ModsView.vue      | 36 ++++++++++++++++++++++++++++-
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0d7e69af..a9483e95 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -23,7 +23,7 @@ use repair_and_verify::{
 
 mod mod_management;
 use mod_management::{
-    fc_download_mod_and_install, get_installed_mods_and_properties, set_mod_enabled_status,
+    fc_download_mod_and_install, get_installed_mods_and_properties, set_mod_enabled_status, delete_northstar_mod,
 };
 
 mod northstar;
@@ -103,6 +103,7 @@ fn main() {
             install_mod_caller,
             clean_up_download_folder_caller,
             get_newest_flightcore_version,
+            delete_northstar_mod,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index 4fe1b517..f6897b90 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -10,6 +10,8 @@ use app::GameInstall;
 
 use json5;
 
+use crate::northstar::CORE_MODS;
+
 pub const BLACKLISTED_MODS: [&str; 3] = [
     "northstar-Northstar",
     "northstar-NorthstarReleaseCandidate",
@@ -385,3 +387,46 @@ pub async fn fc_download_mod_and_install(
 
     Ok(())
 }
+
+/// Deletes a given Northstar mod folder
+fn delete_mod_folder(ns_mod_directory: String) -> Result<(), String> {
+    let ns_mod_dir_path = std::path::Path::new(&ns_mod_directory);
+
+    // Safety check: Check whether `mod.json` exists and exit early if not
+    // If it does not exist, we might not be dealing with a Northstar mod
+    let mod_json_path = ns_mod_dir_path.join("mod.json");
+    if !mod_json_path.exists() {
+        // If it doesn't exist, return an error
+        return Err(format!("mod.json does not exist in {}", ns_mod_directory));
+    }
+
+    match std::fs::remove_dir_all(&ns_mod_directory) {
+        Ok(()) => Ok(()),
+        Err(err) => Err(format!("Failed deleting mod: {err}")),
+    }
+}
+
+/// Deletes a Northstar mod based on its name
+#[tauri::command]
+pub fn delete_northstar_mod(game_install: GameInstall, nsmod_name: String) -> Result<(), String> {
+    // Prevent deleting core mod
+    for core_mod in CORE_MODS {
+        if nsmod_name == core_mod {
+            return Err(format!("Cannot remove core mod {nsmod_name}"));
+        }
+    }
+
+    // Get installed mods
+    let installed_ns_mods = get_installed_mods_and_properties(game_install)?;
+
+    // Get folder name based on northstarmods
+    for installed_ns_mod in installed_ns_mods {
+        // Installed mod matches specified mod
+        if installed_ns_mod.name == nsmod_name {
+            // Delete folder
+            return delete_mod_folder(installed_ns_mod.directory);
+        }
+    }
+
+    Err(format!("Mod {nsmod_name} not found to be installed"))
+}
diff --git a/src-vue/src/views/ModsView.vue b/src-vue/src/views/ModsView.vue
index af3b58a3..2f352ded 100644
--- a/src-vue/src/views/ModsView.vue
+++ b/src-vue/src/views/ModsView.vue
@@ -7,7 +7,15 @@
                 <el-card v-else shadow="hover" v-for="mod in installedMods" v-bind:key="mod.name">
                     <el-switch style="--el-switch-on-color: #13ce66; --el-switch-off-color: #8957e5" v-model="mod.enabled"
                         :before-change="() => updateWhichModsEnabled(mod)" :loading="global_load_indicator" />
-                    {{mod.name}}
+                    <el-popconfirm
+                        title="Are you sure to delete this mod?"
+                        @confirm="deleteMod(mod)"
+                    >
+                        <template #reference>
+                            <el-button type="danger">Delete</el-button>
+                        </template>
+                    </el-popconfirm>
+                    {{ mod.name }}
                 </el-card>
             </div>
         </el-scrollbar>
@@ -69,6 +77,32 @@ export default defineComponent({
 
             this.global_load_indicator = false;
             return true;
+        },
+        async deleteMod(mod: NorthstarMod) {
+            let game_install = {
+                game_path: this.$store.state.game_path,
+                install_type: this.$store.state.install_type
+            } as GameInstall;
+            await invoke("delete_northstar_mod", { gameInstall: game_install, nsmodName: mod.name })
+                .then((message) => {
+                    // Just a visual indicator that it worked
+                    ElNotification({
+                        title: `Success deleting ${mod.name}`,
+                        type: 'success',
+                        position: 'bottom-right'
+                    });
+                })
+                .catch((error) => {
+                    ElNotification({
+                        title: 'Error',
+                        message: error,
+                        type: 'error',
+                        position: 'bottom-right'
+                    });
+                })
+                .finally(() => {
+                    this.$store.commit('loadInstalledMods');
+                });
         }
     }
 });
-- 
cgit v1.2.3


From 8ca94a40165cc8cfcae9eb204d59fc4221951ba6 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Wed, 4 Jan 2023 23:49:15 +0100
Subject: chore: Bump FlightCore version to 1.4.0

---
 src-tauri/Cargo.lock      | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index cc2f4fbb..3f415fc0 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
 name = "app"
-version = "1.3.2"
+version = "1.4.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 7f3f073c..81a8c242 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "1.3.2"
+version = "1.4.0"
 description = "A Tauri App"
 authors = ["you"]
 license = ""
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 9dde0f14..02763f17 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "FlightCore",
-    "version": "1.3.2"
+    "version": "1.4.0"
   },
   "tauri": {
     "allowlist": {
-- 
cgit v1.2.3


From 51772b01b9c2880e6a1afdc98ac2c97293247273 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Thu, 5 Jan 2023 00:11:30 +0100
Subject: docs: Update download link to v1.4.0 of FlightCore

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 152cf059..feda3b76 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 	<img src="docs/assets/Square310x310Logo.png" width="200px">
 	<br>
 	<br>
-	<a href="https://github.com/R2NorthstarTools/FlightCore/releases/download/v1.3.2/FlightCore_1.3.2_x64_en-US.msi"><img src="docs/assets/downloadbutton.png" width="300px"></a>
+	<a href="https://github.com/R2NorthstarTools/FlightCore/releases/download/v1.4.0/FlightCore_1.4.0_x64_en-US.msi"><img src="docs/assets/downloadbutton.png" width="300px"></a>
 	<br>
 </p>
 
-- 
cgit v1.2.3


From 226bac84db9f37a7cd9e7247a77b6024108a7d9f Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Sat, 7 Jan 2023 01:28:29 +0100
Subject: style: Formatting fixes in TypeScript code (#132)

* style: Add missing spaces between curly braces

* style: Fix indentation
---
 src-vue/src/plugins/store.ts | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index ee4af283..57406dec 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -11,7 +11,7 @@ import { NorthstarState } from '../utils/NorthstarState';
 import { appDir } from '@tauri-apps/api/path';
 import { open } from '@tauri-apps/api/dialog';
 import { Store } from 'tauri-plugin-store-api';
-import {router} from "../main";
+import { router } from "../main";
 import ReleaseInfo from "../utils/ReleaseInfo";
 import { ThunderstoreMod } from '../utils/thunderstore/ThunderstoreMod';
 import { NorthstarMod } from "../utils/NorthstarMod";
@@ -86,7 +86,7 @@ export const store = createStore<FlightCoreStore>({
             _initializeListeners(state);
         },
         updateCurrentTab(state: any, newTab: Tabs) {
-            router.push({path: newTab});
+            router.push({ path: newTab });
         },
         async updateGamePath(state: FlightCoreStore) {
             // Open a selection dialog for directories
@@ -320,13 +320,13 @@ async function _initializeApp(state: any) {
     }
 
     // Grab "Enable releases switching" setting from store if possible
-    const valueFromStore: {value: boolean} | null = await persistentStore.get('northstar-releases-switching');
+    const valueFromStore: { value: boolean } | null = await persistentStore.get('northstar-releases-switching');
     if (valueFromStore) {
         state.enableReleasesSwitch = valueFromStore.value;
     }
 
     // Grab "Thunderstore mods per page" setting from store if possible
-    const perPageFromStore: {value: number} | null = await persistentStore.get('thunderstore-mods-per-page');
+    const perPageFromStore: { value: number } | null = await persistentStore.get('thunderstore-mods-per-page');
     if (perPageFromStore && perPageFromStore.value) {
         state.mods_per_page = perPageFromStore.value;
     }
@@ -420,23 +420,23 @@ function _initializeListeners(state: any) {
  */
 async function _get_northstar_version_number(state: any) {
     await invoke("get_northstar_version_number_caller", { gamePath: state.game_path })
-    .then((message) => {
-        let northstar_version_number: string = message as string;
-        state.installed_northstar_version = northstar_version_number;
-        state.northstar_state = NorthstarState.READY_TO_PLAY;
-
-        invoke("check_is_northstar_outdated", { gamePath: state.game_path, northstarPackageName: state.northstar_release_canal })
-            .then((message) => {
-                if (message) {
-                    state.northstar_state = NorthstarState.MUST_UPDATE;
-                }
-            })
-            .catch((error) => {
-                console.error(error);
-                alert(error);
-            });
-    })
-    .catch((error) => {
-        state.northstar_state = NorthstarState.INSTALL;
-    })
+        .then((message) => {
+            let northstar_version_number: string = message as string;
+            state.installed_northstar_version = northstar_version_number;
+            state.northstar_state = NorthstarState.READY_TO_PLAY;
+
+            invoke("check_is_northstar_outdated", { gamePath: state.game_path, northstarPackageName: state.northstar_release_canal })
+                .then((message) => {
+                    if (message) {
+                        state.northstar_state = NorthstarState.MUST_UPDATE;
+                    }
+                })
+                .catch((error) => {
+                    console.error(error);
+                    alert(error);
+                });
+        })
+        .catch((error) => {
+            state.northstar_state = NorthstarState.INSTALL;
+        })
 }
-- 
cgit v1.2.3


From 1ae404dc90a4aa922652e3bedcdee9c3b0016593 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Sat, 7 Jan 2023 03:24:56 +0100
Subject: refactor: Store global const in separate file (#131)

Moved user agent there for now
---
 src-tauri/src/constants.rs            | 3 +++
 src-tauri/src/github/release_notes.rs | 4 ++--
 src-tauri/src/lib.rs                  | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src-tauri/src/constants.rs

diff --git a/src-tauri/src/constants.rs b/src-tauri/src/constants.rs
new file mode 100644
index 00000000..9d7e117c
--- /dev/null
+++ b/src-tauri/src/constants.rs
@@ -0,0 +1,3 @@
+// This file stores various global constants values
+
+pub const APP_USER_AGENT: &str = "R2NorthstarTools/FlightCore";
diff --git a/src-tauri/src/github/release_notes.rs b/src-tauri/src/github/release_notes.rs
index a1d174fa..758f7ace 100644
--- a/src-tauri/src/github/release_notes.rs
+++ b/src-tauri/src/github/release_notes.rs
@@ -1,3 +1,4 @@
+use crate::constants::APP_USER_AGENT;
 use serde::{Deserialize, Serialize};
 use std::vec::Vec;
 
@@ -18,11 +19,10 @@ pub struct FlightCoreVersion {
 async fn fetch_github_releases_api(url: &str) -> Result<String, String> {
     println!("Fetching releases notes from GitHub API");
 
-    let user_agent = "R2NorthstarTools/FlightCore";
     let client = reqwest::Client::new();
     let res = client
         .get(url)
-        .header(reqwest::header::USER_AGENT, user_agent)
+        .header(reqwest::header::USER_AGENT, APP_USER_AGENT)
         .send()
         .await
         .unwrap()
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index f8ea6aba..f0ffa8de 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -4,6 +4,7 @@ use anyhow::{anyhow, Context, Result};
 
 mod northstar;
 
+pub mod constants;
 mod platform_specific;
 #[cfg(target_os = "windows")]
 use platform_specific::windows;
-- 
cgit v1.2.3


From 1df421ba963ae0d740c2915b2e038dfb2f6b8f95 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Sun, 8 Jan 2023 17:50:10 +0100
Subject: feat: Delete given Thunderstore mod (#111)

* feat: Expose installed NS mod directory

This allows other functions to get a mod directory directly which is
useful for e.g. deleting a mod.

* feat: Add button to delete Northstar mod

* refactor: Return vector of NorthstarMod
instead of unnamed Tuples

* feat: Delete given Thunderstore mod

* refactor: replace information button by a dropdown menu with remove item

* refactor: only display removal mod option if said mod is installed

* feat: only display dropdown menu for installed mods

* refactor: Remove leftover print statement

* chore: Remove leftover todo comment

* feat: Show confirm warning before deleting mod

* refactor: Call func directly instead of proxy

Removes the `func_caller` pattern

* fix: Call reloading mods after attempted delete

* feat: Hook up deleting mod backend function

Now clicking "Remove Mod" calls the appropriate backend function that
removes the corresponding mod.

* refactor: Call func directly instead of proxy

Removes the `func_caller` pattern

* style: Autoformat

* feat: Support removing outdated mods

No longer include the version number in the comparison check

* fix: Rephrase error message

* feat: Show pop-up confirmation before deleting mod
for Thunderstore mod in ThunderstoreView

Co-authored-by: Alystrasz <contact@remyraes.com>
Co-authored-by: Remy Raes <raes.remy@gmail.com>
---
 src-tauri/src/main.rs                          |  4 +-
 src-tauri/src/mod_management/mod.rs            | 83 ++++++++++++++++++++++++++
 src-vue/src/components/ThunderstoreModCard.vue | 83 +++++++++++++++++++++++++-
 3 files changed, 167 insertions(+), 3 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index a9483e95..96be489f 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -23,7 +23,8 @@ use repair_and_verify::{
 
 mod mod_management;
 use mod_management::{
-    fc_download_mod_and_install, get_installed_mods_and_properties, set_mod_enabled_status, delete_northstar_mod,
+    delete_northstar_mod, delete_thunderstore_mod, fc_download_mod_and_install,
+    get_installed_mods_and_properties, set_mod_enabled_status,
 };
 
 mod northstar;
@@ -104,6 +105,7 @@ fn main() {
             clean_up_download_folder_caller,
             get_newest_flightcore_version,
             delete_northstar_mod,
+            delete_thunderstore_mod,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index f6897b90..05f70dcf 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -18,6 +18,31 @@ pub const BLACKLISTED_MODS: [&str; 3] = [
     "ebkr-r2modman",
 ];
 
+#[derive(Debug, Clone)]
+struct ParsedThunderstoreModString {
+    author_name: String,
+    mod_name: String,
+    version: Option<String>,
+}
+
+impl std::str::FromStr for ParsedThunderstoreModString {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let mut parts = s.split("-");
+
+        let author_name = parts.next().unwrap().to_string();
+        let mod_name = parts.next().unwrap().to_string();
+        let version = parts.next().map(|s| s.to_string());
+
+        Ok(ParsedThunderstoreModString {
+            author_name,
+            mod_name,
+            version,
+        })
+    }
+}
+
 /// Gets all currently installed and enabled/disabled mods to rebuild `enabledmods.json`
 pub fn rebuild_enabled_mods_json(game_install: GameInstall) -> Result<(), String> {
     let enabledmods_json_path = format!("{}/R2Northstar/enabledmods.json", game_install.game_path);
@@ -430,3 +455,61 @@ pub fn delete_northstar_mod(game_install: GameInstall, nsmod_name: String) -> Re
 
     Err(format!("Mod {nsmod_name} not found to be installed"))
 }
+
+/// Deletes all NorthstarMods related to a Thunderstore mod
+#[tauri::command]
+pub fn delete_thunderstore_mod(
+    game_install: GameInstall,
+    thunderstore_mod_string: String,
+) -> Result<(), String> {
+    // Prevent deleting core mod
+    for core_ts_mod in BLACKLISTED_MODS {
+        if thunderstore_mod_string == core_ts_mod {
+            return Err(format!("Cannot remove core mod {thunderstore_mod_string}"));
+        }
+    }
+
+    let parsed_ts_mod_string: ParsedThunderstoreModString =
+        thunderstore_mod_string.parse().unwrap();
+
+    // Get installed mods
+    let installed_ns_mods = get_installed_mods_and_properties(game_install)?;
+
+    // List of mod folders to remove
+    let mut mod_folders_to_remove: Vec<String> = Vec::new();
+
+    // Get folder name based on Thundestore mod string
+    for installed_ns_mod in installed_ns_mods {
+        if installed_ns_mod.thunderstore_mod_string.is_none() {
+            // Not a Thunderstore mod
+            continue;
+        }
+
+        let installed_ns_mod_ts_string: ParsedThunderstoreModString = installed_ns_mod
+            .thunderstore_mod_string
+            .unwrap()
+            .parse()
+            .unwrap();
+
+        // Installed mod matches specified Thunderstore mod string
+        if parsed_ts_mod_string.author_name == installed_ns_mod_ts_string.author_name
+            && parsed_ts_mod_string.mod_name == installed_ns_mod_ts_string.mod_name
+        {
+            // Add folder to list of folder to remove
+            mod_folders_to_remove.push(installed_ns_mod.directory);
+        }
+    }
+
+    if !(mod_folders_to_remove.len() > 0) {
+        return Err(format!(
+            "No mods removed as no Northstar mods matching {thunderstore_mod_string} were found to be installed."
+        ));
+    }
+
+    // Delete given folders
+    for mod_folder in mod_folders_to_remove {
+        delete_mod_folder(mod_folder)?;
+    }
+
+    Ok(())
+}
diff --git a/src-vue/src/components/ThunderstoreModCard.vue b/src-vue/src/components/ThunderstoreModCard.vue
index 1e742fa2..a202aa50 100644
--- a/src-vue/src/components/ThunderstoreModCard.vue
+++ b/src-vue/src/components/ThunderstoreModCard.vue
@@ -35,11 +35,30 @@
                 >
                     {{ modButtonText }}
                 </el-button>
-                <el-button link type="info" class="infoBtn" @click="openURL(mod.package_url)">
+
+                <!-- Information dropdown menu -->
+                 <el-button v-if="!modIsRemovable"
+                            link type="info" class="infoBtn" @click="openURL(mod.package_url)">
                     <el-icon>
                         <InfoFilled />
                     </el-icon>
                 </el-button>
+
+                <el-dropdown v-else>
+                    <el-icon class="infoBtn moreBtn">
+                        <MoreFilled />
+                    </el-icon>
+                    <template #dropdown>
+                        <el-dropdown-menu>
+                            <el-dropdown-item @click="openURL(mod.package_url)">
+                                More info
+                            </el-dropdown-item>
+                            <el-dropdown-item  @click="deleteMod(mod)">
+                                Remove mod
+                            </el-dropdown-item>
+                        </el-dropdown-menu>
+                    </template>
+                </el-dropdown>
             </span>
         </div>
     </el-card>
@@ -54,6 +73,8 @@ import {ThunderstoreModStatus} from "../utils/thunderstore/ThunderstoreModStatus
 import {NorthstarMod} from "../utils/NorthstarMod";
 import {GameInstall} from "../utils/GameInstall";
 import {ElNotification} from "element-plus";
+import { NorthstarState } from "../utils/NorthstarState";
+import { ElMessageBox } from "element-plus";
 
 export default defineComponent({
     name: "ThunderstoreModCard",
@@ -137,6 +158,15 @@ export default defineComponent({
             }
         },
 
+        /**
+         * Tells if a Thunderstore mod can be removed.
+         * This is used to tell if we should display the "Remove mod" option.
+         **/
+        modIsRemovable(): boolean {
+            return [ThunderstoreModStatus.INSTALLED, ThunderstoreModStatus.OUTDATED]
+                .includes(this.modStatus);
+        },
+
         /**
          * This computes the total count of downloads of a given mod, by adding
          * download count of each of its releases.
@@ -166,6 +196,50 @@ export default defineComponent({
             return `${dependencyStringMembers[0]}-${dependencyStringMembers[1]}`;
         },
 
+        async deleteMod(mod: ThunderstoreMod) {
+
+            // Show pop-up to confirm delete
+            ElMessageBox.confirm(
+                'Delete Thunderstore mod?',
+                'Warning',
+                {
+                    confirmButtonText: 'OK',
+                    cancelButtonText: 'Cancel',
+                    type: 'warning',
+                }
+            )
+                .then(async () => { // Deletion confirmed
+                    let game_install = {
+                        game_path: this.$store.state.game_path,
+                        install_type: this.$store.state.install_type
+                    } as GameInstall;
+
+                    await invoke("delete_thunderstore_mod", { gameInstall: game_install, thunderstoreModString: this.latestVersion.full_name })
+                        .then((message) => {
+                            ElNotification({
+                                title: `Removed ${mod.name}`,
+                                message: message as string,
+                                type: 'success',
+                                position: 'bottom-right'
+                            });
+                        })
+                        .catch((error) => {
+                            ElNotification({
+                                title: 'Error',
+                                message: error,
+                                type: 'error',
+                                position: 'bottom-right'
+                            });
+                        })
+                        .finally(() => {
+                            this.$store.commit('loadInstalledMods');
+                        });
+                })
+                .catch(() => { // Deletion cancelled
+                    console.log("Deleting Thunderstore mod cancelled.")
+                })
+        },
+
         async installMod (mod: ThunderstoreMod) {
             let game_install = {
                 game_path: this.$store.state.game_path,
@@ -241,8 +315,13 @@ export default defineComponent({
 
 .infoBtn {
     width: 20px;
-    padding: 0;
+    padding: 0 !important;
     font-size: 20px;
     border: none;
 }
+
+.moreBtn {
+    margin-left: 10px;
+    height: auto;
+}
 </style>
-- 
cgit v1.2.3


From eb6726fb016c468d39a674cf7707f2438093db1a Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Fri, 13 Jan 2023 01:01:34 +0100
Subject: refactor: Bump libthermite (#133)

* chore: Bump libthermite to v0.4.0-rc.1

And update broken code in FlightCore accordingly

* chore: Bump libthermite to v0.4.0

And update broken code in FlightCore accordingly

* feat: Parse TS mod string using new standard

Instead of reading `mod.json`, we now build Thunderstore mod string
using `manifest.json` and `thunderstore_author.txt`.

The old method for reading is still supported for now but will likely
be replaced by a converted function in the future.

See also discussion in https://github.com/0neGal/viper/issues/165
---
 src-tauri/Cargo.lock                | 38 +++++----------
 src-tauri/Cargo.toml                |  2 +-
 src-tauri/src/lib.rs                |  2 +-
 src-tauri/src/mod_management/mod.rs | 96 ++++++++++++++++++-------------------
 4 files changed, 61 insertions(+), 77 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 3f415fc0..39811b08 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1818,17 +1818,14 @@ dependencies = [
 
 [[package]]
 name = "libthermite"
-version = "0.3.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ced5f2756672c1379a5ee41771af8e1ead525a9f6b1e2a2139105a6754f6bb5"
+checksum = "31ec1288a3f54f21ee6bd7eec92c5d098d9acc82d3bfdcf3c5ae29498ddfdc0e"
 dependencies = [
- "directories",
  "futures-util",
  "indicatif",
  "log",
- "regex",
  "reqwest",
- "ron",
  "serde",
  "serde_json",
  "thiserror",
@@ -2994,17 +2991,6 @@ dependencies = [
  "windows 0.37.0",
 ]
 
-[[package]]
-name = "ron"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
-dependencies = [
- "base64",
- "bitflags",
- "serde",
-]
-
 [[package]]
 name = "rusqlite"
 version = "0.27.0"
@@ -3251,18 +3237,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.149"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.149"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3271,9 +3257,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "itoa 1.0.4",
  "ryu",
@@ -3953,18 +3939,18 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 81a8c242..8dd00034 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -25,7 +25,7 @@ steamlocate = "1.0.2"
 # Error messages
 anyhow = "1.0"
 # libthermite for Northstar/mod install handling
-libthermite = "0.3.4"
+libthermite = "0.4.0"
 # zip stuff
 zip = "0.6.2"
 # Regex
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index f0ffa8de..2df1e243 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -184,7 +184,7 @@ async fn do_install(nmod: &thermite::model::ModVersion, game_path: &std::path::P
     let download_path = format!("{}/{}", download_directory.clone(), filename);
     println!("{}", download_path);
 
-    let nfile = thermite::core::actions::download_file(&nmod.url, download_path)
+    let nfile = thermite::core::manage::download_file(&nmod.url, download_path)
         .await
         .unwrap();
 
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index 05f70dcf..008f72f0 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -3,6 +3,8 @@ use async_recursion::async_recursion;
 
 use anyhow::{anyhow, Result};
 use app::NorthstarMod;
+use serde::{Deserialize, Serialize};
+use std::io::Read;
 use std::path::PathBuf;
 
 use app::get_enabled_mods;
@@ -43,6 +45,12 @@ impl std::str::FromStr for ParsedThunderstoreModString {
     }
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ThunderstoreManifest {
+    name: String,
+    version_number: String,
+}
+
 /// Gets all currently installed and enabled/disabled mods to rebuild `enabledmods.json`
 pub fn rebuild_enabled_mods_json(game_install: GameInstall) -> Result<(), String> {
     let enabledmods_json_path = format!("{}/R2Northstar/enabledmods.json", game_install.game_path);
@@ -133,6 +141,7 @@ fn parse_mod_json_for_mod_name(mod_json_path: String) -> Result<String, anyhow::
 }
 
 /// Parses `mod.json` for Thunderstore mod string
+/// This is a legacy function as nowadays `manifest.json` should be in Northtar mods folder and read from there
 // TODO: Maybe pass PathBuf or serde json object
 fn parse_mod_json_for_thunderstore_mod_string(
     mod_json_path: String,
@@ -153,6 +162,33 @@ fn parse_mod_json_for_thunderstore_mod_string(
     Ok(thunderstore_mod_string.to_string())
 }
 
+/// Parses `manifest.json` for Thunderstore mod string
+fn parse_for_thunderstore_mod_string(nsmod_path: String) -> Result<String, anyhow::Error> {
+    let mod_json_path = format!("{}/mod.json", nsmod_path);
+    let manifest_json_path = format!("{}/manifest.json", nsmod_path);
+    let ts_author_txt_path = format!("{}/thunderstore_author.txt", nsmod_path);
+
+    // Attempt legacy method for getting Thunderstore string first
+    match parse_mod_json_for_thunderstore_mod_string(mod_json_path) {
+        Ok(thunderstore_mod_string) => return Ok(thunderstore_mod_string),
+        Err(_err) => (),
+    }
+
+    // Check if `manifest.json` exists and parse
+    let data = std::fs::read_to_string(manifest_json_path)?;
+    let thunderstore_manifest: ThunderstoreManifest = json5::from_str(&data)?;
+
+    // Check if `thunderstore_author.txt` exists and parse
+    let mut file = std::fs::File::open(ts_author_txt_path)?;
+    let mut thunderstore_author = String::new();
+    file.read_to_string(&mut thunderstore_author)?;
+
+    // Build mod string
+    let thunderstore_mod_string = format!("{}-{}-{}", thunderstore_author, thunderstore_manifest.name, thunderstore_manifest.version_number);
+
+    Ok(thunderstore_mod_string)
+}
+
 /// Parse `mods` folder for installed mods.
 fn parse_installed_mods(game_install: GameInstall) -> Result<Vec<NorthstarMod>, String> {
     let ns_mods_folder = format!("{}/R2Northstar/mods/", game_install.game_path);
@@ -174,8 +210,9 @@ fn parse_installed_mods(game_install: GameInstall) -> Result<Vec<NorthstarMod>,
 
     // Iterate over folders and check if they are Northstar mods
     for directory in directories {
+        let directory_str = directory.to_str().unwrap().to_string();
         // Check if mod.json exists
-        let mod_json_path = format!("{}/mod.json", directory.to_str().unwrap());
+        let mod_json_path = format!("{}/mod.json", directory_str);
         if !std::path::Path::new(&mod_json_path).exists() {
             continue;
         }
@@ -188,8 +225,9 @@ fn parse_installed_mods(game_install: GameInstall) -> Result<Vec<NorthstarMod>,
                 continue;
             }
         };
+        // Get Thunderstore mod string if it exists
         let thunderstore_mod_string =
-            match parse_mod_json_for_thunderstore_mod_string(mod_json_path.clone()) {
+            match parse_for_thunderstore_mod_string(directory_str) {
                 Ok(thunderstore_mod_string) => Some(thunderstore_mod_string),
                 Err(_err) => None,
             };
@@ -262,32 +300,6 @@ async fn get_ns_mod_download_url(thunderstore_mod_string: String) -> Result<Stri
     Err("Could not find mod on Thunderstore".to_string())
 }
 
-/// Adds given Thunderstore mod string to the given `mod.json`
-/// This way we can later check whether a mod is outdated based on the TS mod string
-fn add_thunderstore_mod_string(
-    path_to_mod_json: String,
-    thunderstore_mod_string: String,
-) -> Result<(), anyhow::Error> {
-    // Read file into string and parse it
-    let data = std::fs::read_to_string(path_to_mod_json.clone())?;
-    let parsed_json: serde_json::Value = json5::from_str(&data)?;
-
-    // Insert the Thunderstore mod string
-    let mut parsed_json = parsed_json.as_object().unwrap().clone();
-    parsed_json.insert(
-        "ThunderstoreModString".to_string(),
-        serde_json::Value::String(thunderstore_mod_string),
-    );
-
-    // And write back to disk
-    std::fs::write(
-        path_to_mod_json,
-        serde_json::to_string_pretty(&parsed_json)?,
-    )?;
-
-    Ok(())
-}
-
 /// Returns a vector of modstrings containing the dependencies of a given mod
 async fn get_mod_dependencies(
     thunderstore_mod_string: String,
@@ -377,35 +389,21 @@ pub async fn fc_download_mod_and_install(
     );
 
     // Download the mod
-    let f = match thermite::core::actions::download_file(&download_url, path.clone()).await {
+    let f = match thermite::core::manage::download_file(&download_url, path.clone()).await {
         Ok(f) => f,
         Err(e) => return Err(e.to_string()),
     };
 
+    // Get Thunderstore mod author
+    let author = thunderstore_mod_string.split("-").next().unwrap();
+
     // Extract the mod to the mods directory
-    let pkg = match thermite::core::actions::install_mod(&f, std::path::Path::new(&mods_directory))
+    match thermite::core::manage::install_mod(author, &f, std::path::Path::new(&mods_directory))
     {
-        Ok(pkg) => pkg,
+        Ok(()) => (),
         Err(err) => return Err(err.to_string()),
     };
-    dbg!(pkg.clone());
-
-    // Add Thunderstore mod string to `mod.json` of installed NorthstarMods
-    for nsmod in pkg.mods {
-        let path_to_current_mod_json = format!(
-            "{}/{}/mod.json",
-            mods_directory,
-            nsmod.path.to_string_lossy()
-        );
-        match add_thunderstore_mod_string(path_to_current_mod_json, thunderstore_mod_string.clone())
-        {
-            Ok(()) => (),
-            Err(err) => {
-                println!("Failed setting modstring for {}", nsmod.name);
-                println!("{}", err);
-            }
-        }
-    }
+
 
     // Delete downloaded zip file
     std::fs::remove_file(path).unwrap();
-- 
cgit v1.2.3


From 5baa6a22a18970fc294710f42afcea2e5da2200d Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Fri, 13 Jan 2023 17:00:31 +0100
Subject: feat: Add backend code for getting playercount (#135)

* feat: Initial backend code to get the playercount
from the Northstar master server together with servercount

* fix: Push correct backend code

* feat: Load playercount on application load
and show on PlayView

* refactor: Store global const in separate file

Moved user agent there for now

* refactor: User user agent from global const

* refactor: Move masterserver URL into global const

* refactor: Remove temporary variable

* fix: Do proper typing for playercount return value

* feat: Change text if unable to load playercount

So instead of showing some wrong value, we just say that we were unable
to load it.

* fix: Remove leftover print statement

* refactor: Move struct to library source file

* fix: Remove break element

* fix: Remove frontend display of playercount

This allows for separate PR for adding backend code early.

* refactor: serverlist endpoint var to global const
---
 src-tauri/src/constants.rs   |  6 ++++++
 src-tauri/src/lib.rs         |  6 ++++++
 src-tauri/src/main.rs        | 35 ++++++++++++++++++++++++++++++++++-
 src-vue/src/plugins/store.ts | 16 ++++++++++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src-tauri/src/constants.rs b/src-tauri/src/constants.rs
index 9d7e117c..4cc3c204 100644
--- a/src-tauri/src/constants.rs
+++ b/src-tauri/src/constants.rs
@@ -1,3 +1,9 @@
 // This file stores various global constants values
 
 pub const APP_USER_AGENT: &str = "R2NorthstarTools/FlightCore";
+
+// URL of the Northstar masterserver
+pub const MASTER_SERVER_URL: &str = "https://northstar.tf";
+
+// server list endpoint
+pub const SERVER_BROWSER_ENDPOINT: &str = "/client/servers";
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 2df1e243..67f42f85 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -39,6 +39,12 @@ pub struct NorthstarMod {
     pub directory: String,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct NorthstarServer {
+    #[serde(rename = "playerCount")]
+    pub player_count: i32,
+}
+
 /// Check version number of a mod
 pub fn check_mod_version_number(path_to_mod_folder: String) -> Result<String, anyhow::Error> {
     // println!("{}", format!("{}/mod.json", path_to_mod_folder));
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 96be489f..b47a796e 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -9,7 +9,7 @@ use std::{
     time::Duration,
 };
 
-use app::*;
+use app::{*, constants::{APP_USER_AGENT, MASTER_SERVER_URL, SERVER_BROWSER_ENDPOINT}};
 
 mod github;
 use github::release_notes::{
@@ -30,6 +30,7 @@ use mod_management::{
 mod northstar;
 use northstar::get_northstar_version_number;
 
+use serde::{Deserialize, Serialize};
 use tauri::Manager;
 use tauri_plugin_store::PluginBuilder;
 use tokio::time::sleep;
@@ -105,6 +106,7 @@ fn main() {
             clean_up_download_folder_caller,
             get_newest_flightcore_version,
             delete_northstar_mod,
+            get_server_player_count,
             delete_thunderstore_mod,
         ])
         .run(tauri::generate_context!())
@@ -307,3 +309,34 @@ async fn clean_up_download_folder_caller(
         Err(err) => Err(err.to_string()),
     }
 }
+
+
+/// Gets server and playercount from master server API
+#[tauri::command]
+async fn get_server_player_count() -> Result<(i32, usize), String> {
+
+    let url = format!("{MASTER_SERVER_URL}{SERVER_BROWSER_ENDPOINT}");
+    let client = reqwest::Client::new();
+    let res = client
+        .get(url)
+        .header(reqwest::header::USER_AGENT, APP_USER_AGENT)
+        .send()
+        .await
+        .unwrap()
+        .text()
+        .await
+        .unwrap();
+
+    let ns_servers: Vec<NorthstarServer> =
+        serde_json::from_str(&res).expect("JSON was not well-formatted");
+
+    // Get server count
+    let server_count = ns_servers.len();
+
+    // Sum up player count
+    let total_player_count: i32 = ns_servers.iter().map(|server| server.player_count).sum();
+
+    dbg!((total_player_count, server_count));
+
+    Ok((total_player_count, server_count))
+}
diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index 57406dec..edeb13df 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -38,6 +38,9 @@ export interface FlightCoreStore {
     northstar_is_running: boolean,
     origin_is_running: boolean,
 
+    player_count: number,
+    server_count: number,
+
     // user custom settings
     mods_per_page: number,
 }
@@ -65,6 +68,9 @@ export const store = createStore<FlightCoreStore>({
             northstar_is_running: false,
             origin_is_running: false,
 
+            player_count: -1,
+            server_count: -1,
+
             mods_per_page: 20,
         }
     },
@@ -382,6 +388,16 @@ async function _initializeApp(state: any) {
         // Check installed Northstar version if found
         await _get_northstar_version_number(state);
     }
+
+    await invoke<[number, number]>("get_server_player_count")
+        .then((message) => {
+            state.player_count = message[0];
+            state.server_count = message[1];
+        })
+        .catch((error) => {
+            console.warn("Failed getting player/server count");
+            console.warn(error);
+        });
 }
 
 async function _checkForFlightCoreUpdates(state: FlightCoreStore) {
-- 
cgit v1.2.3


From 99ec292f40726544d8ccd4890c5112fd784db6f4 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Fri, 13 Jan 2023 17:26:53 +0100
Subject: chore: Bump FlightCore version to 1.5.0

---
 src-tauri/Cargo.lock      | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 39811b08..65133a9e 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
 name = "app"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 8dd00034..71c861fc 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "1.4.0"
+version = "1.5.0"
 description = "A Tauri App"
 authors = ["you"]
 license = ""
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 02763f17..ad7045b8 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "FlightCore",
-    "version": "1.4.0"
+    "version": "1.5.0"
   },
   "tauri": {
     "allowlist": {
-- 
cgit v1.2.3


From bcdab67ee1e0c34dbbf0e6c5d294b8a163ebeeff Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Fri, 13 Jan 2023 17:50:00 +0100
Subject: docs: Update download link to v1.5.0 of FlightCore

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index feda3b76..4d3cf5d6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 	<img src="docs/assets/Square310x310Logo.png" width="200px">
 	<br>
 	<br>
-	<a href="https://github.com/R2NorthstarTools/FlightCore/releases/download/v1.4.0/FlightCore_1.4.0_x64_en-US.msi"><img src="docs/assets/downloadbutton.png" width="300px"></a>
+	<a href="https://github.com/R2NorthstarTools/FlightCore/releases/download/v1.5.0/FlightCore_1.5.0_x64_en-US.msi"><img src="docs/assets/downloadbutton.png" width="300px"></a>
 	<br>
 </p>
 
-- 
cgit v1.2.3


From 20c3880721cd0f0bd0a2b48a1463b49c514a849b Mon Sep 17 00:00:00 2001
From: Rémy Raes <contact@remyraes.com>
Date: Sat, 14 Jan 2023 01:18:48 +0100
Subject: refactor: Mods view (#134)

* feat: add UI skeleton for new mods interface

* fix: only apply app menu style to app menu items

* feat: add menu skeleton

* feat: add thunderstore mods view into mods view

* refactor: remove thunderstore mods view from router + menu bar

* refactor: move search input into mods view

* fix: adjust ts mods container padding

* refactor: center pagination components

* refactor: rework media queries to adapt cards container width

* fix: set mods view navigation min-width

* refactor: compute mods container width with CSS variables

* refactor: remove horizontal padding around ts mods container

This will allow them to take much screen space.

* feat: Thunderstore mods container is larger

* feat: add layouts for 5 to 8 Thunderstore mod columns

* feat: add some space to separate navigation menu subparts

* fix: move search pagination reset in ThunderstoreModsView component

* feat: retrieve Thunderstore mod categories when fetching mods

* feat: add mod categories selector component

* feat: mod categories selector now filters Thunderstore mods

* fix: reset pagination index if needed when selecting mod categories

* fix: first mod does not appear anymore while selecting any mod category

First mod's categories array was used as an accumulator (in a reduce call)
to regroup all mod categories; we now use an empty array as initial value
for the accumulator.

* feat: add a selector component to sort mods

* feat: set sort selector default value on view mount

* fix: set default sorting select value as selected in dropdown list

* feat: add date_updated field to ThunderstoreMod type

* feat: pass sorting value to ThunderstoreModsView as a prop

* feat: mods can be sorted by name and release date

* feat: mods can be sorted by most downloaded and top rated

* fix: don't display sorting select on local mods view

* refactor: remove local mods title

* refactor: export local mods view code in dedicated component

* refactor: export search value in a search-dedicated store

* fix: display "no matching mods" message when no mods match

This message was previously displayed only if no mods matched AND search
input was not empty; now that we have categories selector, we can have no
matching mods with an empty input.

* refactor: remove unused input prop

* fix: mods can be sorted by rating

* refactor: remove unused searchValue computed property

* style: adjust SortOptions import

* refactor: move selected mod categories into search store module

* refactor: move mod sorting into search store module

* refactor: export mods menu component to dedicated file

* fix: remove compare method initialization

* feat: local mods can be filtered with search input

* build: add ES2018 lib to typescript compiler options

* refactor: remove unused variable

* fix: retrieve SortOptions values from string input

* refactor: move Thunderstore mods view into dedicated folder

* style: add missing trailing newline to SortOptions.d.ts
---
 src-vue/src/App.vue                                |   3 +-
 src-vue/src/components/ModsMenu.vue                | 118 +++++++++
 src-vue/src/main.ts                                |   2 -
 src-vue/src/plugins/modules/search.ts              |  19 ++
 src-vue/src/plugins/store.ts                       |  16 ++
 src-vue/src/utils/SortOptions.d.ts                 |   8 +
 .../src/utils/thunderstore/ThunderstoreMod.d.ts    |   2 +
 src-vue/src/views/ModsView.vue                     | 128 +++-------
 src-vue/src/views/ThunderstoreModsView.vue         | 240 ------------------
 src-vue/src/views/mods/LocalModsView.vue           | 122 +++++++++
 src-vue/src/views/mods/ThunderstoreModsView.vue    | 272 +++++++++++++++++++++
 src-vue/tsconfig.json                              |   2 +-
 12 files changed, 592 insertions(+), 340 deletions(-)
 create mode 100644 src-vue/src/components/ModsMenu.vue
 create mode 100644 src-vue/src/plugins/modules/search.ts
 create mode 100644 src-vue/src/utils/SortOptions.d.ts
 delete mode 100644 src-vue/src/views/ThunderstoreModsView.vue
 create mode 100644 src-vue/src/views/mods/LocalModsView.vue
 create mode 100644 src-vue/src/views/mods/ThunderstoreModsView.vue

diff --git a/src-vue/src/App.vue b/src-vue/src/App.vue
index fc6992b7..0ecea16d 100644
--- a/src-vue/src/App.vue
+++ b/src-vue/src/App.vue
@@ -59,7 +59,6 @@ export default {
         <el-menu-item index="/">Play</el-menu-item>
         <el-menu-item index="/changelog">Changelog</el-menu-item>
         <el-menu-item index="/mods">Mods</el-menu-item>
-        <el-menu-item index="/thunderstoreMods">Thunderstore</el-menu-item>
         <el-menu-item index="/settings">Settings</el-menu-item>
         <el-menu-item index="/dev" v-if="$store.state.developer_mode">Dev</el-menu-item>
       </el-menu>
@@ -109,7 +108,7 @@ export default {
   border-color: white;
 }
 
-.el-menu > .el-menu-item {
+#fc__menu_items > .el-menu-item {
   text-transform: uppercase;
   border: none !important;
   font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
diff --git a/src-vue/src/components/ModsMenu.vue b/src-vue/src/components/ModsMenu.vue
new file mode 100644
index 00000000..9b62fcfa
--- /dev/null
+++ b/src-vue/src/components/ModsMenu.vue
@@ -0,0 +1,118 @@
+<template>
+    <nav class="fc_mods__menu">
+        <el-menu
+            default-active="1"
+            text-color="#fff"
+        >
+            <h5>Mods</h5>
+            <el-menu-item index="1" @click="$emit('showLocalMods', true)">
+                <el-icon><Folder /></el-icon>
+                <span>Local</span>
+            </el-menu-item>
+            <el-menu-item index="2" @click="$emit('showLocalMods', false)">
+                <el-icon><Connection /></el-icon>
+                <span>Online</span>
+            </el-menu-item>
+
+            <!-- Search inputs -->
+            <h5>Filter</h5>
+            <el-input v-model="$store.state.search.searchValue" placeholder="Search" clearable />
+            <el-select
+                v-if="!showingLocalMods"
+                v-model="$store.state.search.sortValue" 
+                placeholder="Sort mods"
+            >
+                <el-option
+                    v-for="item of sortValues"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+            </el-select>
+            <el-select
+                v-if="!showingLocalMods"
+                v-model="$store.state.search.selectedCategories"
+                multiple
+                placeholder="Select categories"
+            >
+                <el-option
+                    v-for="item in $store.state.thunderstoreModsCategories"
+                    :key="item"
+                    :label="item"
+                    :value="item"
+                />
+            </el-select>
+
+        </el-menu>
+    </nav>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { SortOptions } from '../utils/SortOptions.d';
+
+export default defineComponent({
+    name: 'ModsMenu',
+    props: {
+        showingLocalMods: {
+            required: true,
+            type: Boolean
+        }
+    },
+    mounted() {
+        this.$store.state.search.sortValue = this.sortValues[3].value;
+    },
+    computed: {
+        sortValues(): {label: string, value: string}[] {
+            return Object.keys(SortOptions).map((key: string) => ({
+                value: key,
+                label: Object.values(SortOptions)[Object.keys(SortOptions).indexOf(key)]
+            }));
+        }
+    }
+})
+</script>
+
+<style scoped>
+.fc_mods__menu {
+    display: flex;
+    max-width: 222px;
+    min-width: 222px;
+    padding: 10px;
+}
+
+.fc_mods__menu h5 {
+    margin: 8px 0 16px 5px;
+}
+
+.fc_mods__menu h5:not(:first-child){
+    margin-top: 32px;
+}
+
+.fc_mods__menu > .el-menu {
+    background-color: transparent;
+    border: none;
+    width: 100%;
+}
+
+.fc_mods__menu > .el-menu > .el-menu-item {
+    height: 32px;
+    margin-bottom: 5px;
+    border-radius: 5px;
+    color: #e2e6e7;
+}
+
+.fc_mods__menu > .el-menu > .el-menu-item:hover {
+    background-color: #4e4e4e3b;
+}
+
+.fc_mods__menu > .el-menu > .el-menu-item.is-active {
+    color: white;
+    background-color: #4e4e4e7a;
+}
+
+.el-select {
+    width: 100%;
+    margin-top: 5px;
+}
+</style>
diff --git a/src-vue/src/main.ts b/src-vue/src/main.ts
index 25f1b064..95bea7af 100644
--- a/src-vue/src/main.ts
+++ b/src-vue/src/main.ts
@@ -6,7 +6,6 @@ import { store } from './plugins/store';
 import PlayView from "./views/PlayView.vue";
 import ChangelogView from "./views/ChangelogView.vue";
 import ModsView from "./views/ModsView.vue";
-import ThunderstoreModsView from "./views/ThunderstoreModsView.vue";
 import SettingsView from "./views/SettingsView.vue";
 import DeveloperView from "./views/DeveloperView.vue";
 import {createRouter, createWebHashHistory} from "vue-router";
@@ -35,7 +34,6 @@ const routes = [
     { path: '/', name: 'Main', component: async () => PlayView},
     { path: '/changelog', name: 'Changelog', component: async () => ChangelogView},
     { path: '/mods', name: 'Mods', component: async () => ModsView},
-    { path: '/thunderstoreMods', name: 'Thunderstore mods', component: async () => ThunderstoreModsView},
     { path: '/settings', name: 'Settings', component: async () => SettingsView},
     { path: '/dev', name: 'Dev', component: async () => DeveloperView}
 ];
diff --git a/src-vue/src/plugins/modules/search.ts b/src-vue/src/plugins/modules/search.ts
new file mode 100644
index 00000000..16260387
--- /dev/null
+++ b/src-vue/src/plugins/modules/search.ts
@@ -0,0 +1,19 @@
+interface SearchStoreState {
+    searchValue: string
+}
+
+export const searchModule = {
+    state: () => ({
+        // This is the treated value of search input
+        searchValue: '',
+        // Selected mod categories
+        selectedCategories: [],
+        sortValue: {label: '', value: ''}
+    }),
+    getters: {
+        searchWords(state: SearchStoreState): string {
+            return state.searchValue.toLowerCase();
+        }
+    }
+  }
+  
\ No newline at end of file
diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
index edeb13df..2eae843a 100644
--- a/src-vue/src/plugins/store.ts
+++ b/src-vue/src/plugins/store.ts
@@ -15,6 +15,7 @@ import { router } from "../main";
 import ReleaseInfo from "../utils/ReleaseInfo";
 import { ThunderstoreMod } from '../utils/thunderstore/ThunderstoreMod';
 import { NorthstarMod } from "../utils/NorthstarMod";
+import { searchModule } from './modules/search';
 
 const persistentStore = new Store('flight-core-settings.json');
 
@@ -33,6 +34,7 @@ export interface FlightCoreStore {
     releaseNotes: ReleaseInfo[],
 
     thunderstoreMods: ThunderstoreMod[],
+    thunderstoreModsCategories: string[],
     installed_mods: NorthstarMod[],
 
     northstar_is_running: boolean,
@@ -48,6 +50,9 @@ export interface FlightCoreStore {
 let notification_handle: NotificationHandle;
 
 export const store = createStore<FlightCoreStore>({
+    modules: {
+        search: searchModule
+    },
     state(): FlightCoreStore {
         return {
             developer_mode: false,
@@ -63,6 +68,7 @@ export const store = createStore<FlightCoreStore>({
             releaseNotes: [],
 
             thunderstoreMods: [],
+            thunderstoreModsCategories: [],
             installed_mods: [],
 
             northstar_is_running: false,
@@ -244,6 +250,16 @@ export const store = createStore<FlightCoreStore>({
             state.thunderstoreMods = mods.filter((mod: ThunderstoreMod) => {
                 return !removedMods.includes(mod.name) && !mod.is_deprecated;
             });
+
+            // Retrieve categories from mods
+            state.thunderstoreModsCategories = mods
+                .map((mod: ThunderstoreMod) => mod.categories)
+                .filter((modCategories: string[]) => modCategories.length !== 0)
+                .reduce((accumulator: string[], modCategories: string[]) => {
+                    accumulator.push( ...modCategories.filter((cat: string) => !accumulator.includes(cat)) );
+                    return accumulator;
+                }, [])
+                .sort();
         },
         async loadInstalledMods(state: FlightCoreStore) {
             let game_install = {
diff --git a/src-vue/src/utils/SortOptions.d.ts b/src-vue/src/utils/SortOptions.d.ts
new file mode 100644
index 00000000..6bdd0a4a
--- /dev/null
+++ b/src-vue/src/utils/SortOptions.d.ts
@@ -0,0 +1,8 @@
+export enum SortOptions {
+    NAME_ASC = 'By name (A to Z)',
+    NAME_DESC = 'By name (Z to A)',
+    DATE_ASC = 'By date (from oldest)',
+    DATE_DESC = 'By date (from newest)',
+    MOST_DOWNLOADED = "Most downloaded",
+    TOP_RATED = "Top rated"
+}
diff --git a/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts b/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts
index 6fddd06f..6387c47e 100644
--- a/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts
+++ b/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts
@@ -3,8 +3,10 @@ import { ThunderstoreModVersion } from "./ThunderstoreModVersion";
 export interface ThunderstoreMod {
     name: string;
     owner: string;
+    date_updated: string;
     rating_score: number;
     package_url: string;
     is_deprecated: boolean;
     versions: ThunderstoreModVersion[];
+    categories: string[];
 }
diff --git a/src-vue/src/views/ModsView.vue b/src-vue/src/views/ModsView.vue
index 2f352ded..7c309832 100644
--- a/src-vue/src/views/ModsView.vue
+++ b/src-vue/src/views/ModsView.vue
@@ -1,112 +1,50 @@
 <template>
-    <div class="fc-container">
-        <el-scrollbar>
-            <h3>Installed Mods:</h3>
-            <div>
-                <p v-if="installedMods.length === 0">No mods were found.</p>
-                <el-card v-else shadow="hover" v-for="mod in installedMods" v-bind:key="mod.name">
-                    <el-switch style="--el-switch-on-color: #13ce66; --el-switch-off-color: #8957e5" v-model="mod.enabled"
-                        :before-change="() => updateWhichModsEnabled(mod)" :loading="global_load_indicator" />
-                    <el-popconfirm
-                        title="Are you sure to delete this mod?"
-                        @confirm="deleteMod(mod)"
-                    >
-                        <template #reference>
-                            <el-button type="danger">Delete</el-button>
-                        </template>
-                    </el-popconfirm>
-                    {{ mod.name }}
-                </el-card>
-            </div>
-        </el-scrollbar>
+    <div class="fc-container" style="display: flex">
+        <!-- Local mods/Thunderstore mods menu -->
+        <mods-menu
+            :showingLocalMods="show_local_mods"
+            @showLocalMods="(v) => show_local_mods = v"
+        />
+
+        <!-- Mods content -->
+        <div class="fc_mods__container">
+            <local-mods-view
+                v-if="show_local_mods"
+            />
+
+            <thunderstore-mods-view
+                v-else
+                clearable
+            />
+        </div>
     </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { ElNotification } from "element-plus";
-import { invoke } from '@tauri-apps/api/tauri';
-import { GameInstall } from "../utils/GameInstall";
-import { NorthstarMod } from "../utils/NorthstarMod"
+import ThunderstoreModsView from "./mods/ThunderstoreModsView.vue";
+import LocalModsView from "./mods/LocalModsView.vue";
+import ModsMenu from "../components/ModsMenu.vue";
 
 export default defineComponent({
     name: "ModsView",
+    components: {
+        ModsMenu,
+        LocalModsView,
+        ThunderstoreModsView
+    },
     data() {
         return {
-            global_load_indicator: false
-        }
-    },
-    async mounted() {
-        this.$store.commit('loadInstalledMods');
-    },
-    computed: {
-        installedMods(): NorthstarMod[] {
-            return this.$store.state.installed_mods;
-        }
-    },
-    methods: {
-        async updateWhichModsEnabled(mod: NorthstarMod) {
-            this.global_load_indicator = true;
-
-            // Setup up struct
-            let game_install = {
-                game_path: this.$store.state.game_path,
-                install_type: this.$store.state.install_type
-            } as GameInstall;
-
-            // enable/disable specific mod
-            try {
-                await invoke("set_mod_enabled_status", {
-                    gameInstall: game_install,
-                    modName: mod.name,
-                    // Need to set it to the opposite of current state,
-                    // as current state is only updated after command is run
-                    isEnabled: !mod.enabled,
-                })
-            }
-            catch (error) {
-                ElNotification({
-                    title: 'Error',
-                    message: `${error}`,
-                    type: 'error',
-                    position: 'bottom-right'
-                });
-                this.global_load_indicator = false;
-                return false;
-            }
-
-            this.global_load_indicator = false;
-            return true;
-        },
-        async deleteMod(mod: NorthstarMod) {
-            let game_install = {
-                game_path: this.$store.state.game_path,
-                install_type: this.$store.state.install_type
-            } as GameInstall;
-            await invoke("delete_northstar_mod", { gameInstall: game_install, nsmodName: mod.name })
-                .then((message) => {
-                    // Just a visual indicator that it worked
-                    ElNotification({
-                        title: `Success deleting ${mod.name}`,
-                        type: 'success',
-                        position: 'bottom-right'
-                    });
-                })
-                .catch((error) => {
-                    ElNotification({
-                        title: 'Error',
-                        message: error,
-                        type: 'error',
-                        position: 'bottom-right'
-                    });
-                })
-                .finally(() => {
-                    this.$store.commit('loadInstalledMods');
-                });
+            show_local_mods: true,
         }
     }
 });
 </script>
 
-<style>
+<style scoped>
+.fc_mods__container {
+    display: flex;
+    width: 100%;
+    flex-direction: column;
+}
 </style>
diff --git a/src-vue/src/views/ThunderstoreModsView.vue b/src-vue/src/views/ThunderstoreModsView.vue
deleted file mode 100644
index 5733d30b..00000000
--- a/src-vue/src/views/ThunderstoreModsView.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-    <div class="fc-container">
-        <div v-if="mods.length === 0" class="fc__changelog__container">
-            <el-progress :show-text="false" :percentage="50" :indeterminate="true" />
-        </div>
-        <el-scrollbar v-else class="container" ref="scrollbar">
-            <div class="card-container">
-                <!-- Search filters -->
-                <div class="filter_container">
-                    <el-input v-model="input" placeholder="Search" clearable @input="onFilterTextChange" />
-                    <!-- Message displayed when user is typing in search bar -->
-                    <div v-if="userIsTyping" class="modMessage search">
-                        Searching mods...
-                    </div>
-
-                    <!-- Pagination -->
-                    <el-pagination
-                        v-if="shouldDisplayPagination"
-                        :currentPage="currentPageIndex + 1"
-                        layout="prev, pager, next"
-                        :page-size="modsPerPage"
-                        :total="modsList.length"
-                        @current-change="(e: number) => currentPageIndex = e - 1"
-                    />
-                </div>
-
-                <!-- Message displayed if no mod matched searched words -->
-                <div v-if="filteredMods.length === 0 && input.length !== 0 && !userIsTyping" class="modMessage">
-                    No matching mod has been found.<br/>
-                    Try another search!
-                </div>
-
-                <!-- Mod cards -->
-                <thunderstore-mod-card v-for="mod of currentPageMods" v-bind:key="mod.name" :mod="mod" />
-            </div>
-
-            <!-- Bottom pagination -->
-            <div class="card-container">
-                <div class="filter_container">
-                    <el-pagination
-                        class="fc_bottom__pagination"
-                        v-if="shouldDisplayPagination"
-                        :currentPage="currentPageIndex + 1"
-                        layout="prev, pager, next"
-                        :page-size="modsPerPage"
-                        :total="modsList.length"
-                        @current-change="onBottomPaginationChange"
-                    />
-                </div>
-            </div>
-        </el-scrollbar>
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { ThunderstoreMod } from "../utils/thunderstore/ThunderstoreMod";
-import ThunderstoreModCard from "../components/ThunderstoreModCard.vue";
-import { ElScrollbar, ScrollbarInstance } from "element-plus";
-
-export default defineComponent({
-    name: "ThunderstoreModsView",
-    components: {ThunderstoreModCard},
-    async mounted() {
-        this.$store.commit('fetchThunderstoreMods');
-    },
-    computed: {
-        mods(): ThunderstoreMod[] {
-            return this.$store.state.thunderstoreMods;
-        },
-        filteredMods(): ThunderstoreMod[] {
-            if (this.searchValue.length === 0) {
-                return this.mods;
-            }
-
-            return this.mods.filter((mod: ThunderstoreMod) => {
-                return mod.name.toLowerCase().includes(this.searchValue)
-                    || mod.owner.toLowerCase().includes(this.searchValue)
-                    || mod.versions[0].description.toLowerCase().includes(this.searchValue);
-            });
-        },
-        modsList(): ThunderstoreMod[] {
-            return this.input.length !== 0 || this.userIsTyping ? this.filteredMods : this.mods;
-        },
-        modsPerPage(): number {
-            return parseInt(this.$store.state.mods_per_page);
-        },
-        currentPageMods(): ThunderstoreMod[] {
-            // User might want to display all mods on one page.
-            const perPageValue = this.modsPerPage != 0 ? this.modsPerPage : this.modsList.length;
-
-            const startIndex = this.currentPageIndex * perPageValue;
-            const endIndexCandidate = startIndex + perPageValue;
-            const endIndex =  endIndexCandidate > this.modsList.length ? this.modsList.length : endIndexCandidate;
-            return this.modsList.slice(startIndex, endIndex);
-        },
-        shouldDisplayPagination(): boolean {
-            return this.modsPerPage != 0 && this.modsList.length > this.modsPerPage;
-        }
-    },
-    data() {
-        return {
-            // This is the model for the search input.
-            input: '',
-            // This is the treated value of search input
-            searchValue: '',
-
-            modsBeingInstalled: [] as string[],
-            userIsTyping: false,
-
-            currentPageIndex: 0
-        };
-    },
-    methods: {
-        /**
-         * This method is called each time search input is modified, and
-         * triggered filtered mods recomputing by updating the `searchValue`
-         * variable.
-         *
-         * This converts research string and all researched fields to
-         * lower case, to match mods regardless of font case.
-         */
-         onFilterTextChange(value: string) {
-            this.currentPageIndex = 0;
-            this.searchValue = value.toLowerCase();
-        },
-
-        /**
-         * This updates current pagination and scrolls view to the top.
-         */
-        onBottomPaginationChange(index: number) {
-            this.currentPageIndex = index - 1;
-            (this.$refs.scrollbar as ScrollbarInstance).scrollTo({ top: 0, behavior: 'smooth' });
-        }
-    }
-});
-</script>
-
-<style scoped>
-.fc__changelog__container {
-    padding: 20px 30px;
-}
-
-.el-timeline-item__timestamp {
-    color: white !important;
-    user-select: none !important;
-}
-
-.search {
-    display: inline-block;
-    margin: 0 0 0 10px !important;
-}
-
-.modMessage {
-    color: white;
-    margin: 20px 5px;
-}
-
-.card-container {
-    margin: 0 auto;
-}
-
-.fc_bottom__pagination {
-    padding-bottom: 20px !important;
-    padding-right: 10px;
-}
-
-/* Card container dynamic size */
-@media (max-width: 1000px) {
-    .card-container {
-        width: 752px;
-    }
-}
-
-@media (max-width: 812px) {
-    .card-container {
-        width: 574px;
-    }
-
-    .el-pagination {
-        float: none;
-        margin-top: 5px;
-    }
-}
-
-@media (max-width: 624px) {
-    .card-container {
-        width: 376px;
-    }
-}
-
-.filter_container {
-    margin-bottom: 10px;
-}
-
-.el-input {
-    max-width: 200px;
-}
-
-@media (min-width: 812px) {
-    .filter_container {
-        margin: 5px auto;
-        padding: 0 5px;
-        max-width: 1000px;
-    }
-
-    .el-pagination {
-        float: right;
-        margin: 0;
-    }
-}
-
-@media (min-width: 1000px) {
-    .card-container {
-        width: 940px;
-    }
-
-    .el-input {
-        max-width: 300px;
-    }
-}
-
-@media (min-width: 1188px) {
-    .card-container {
-        width: 1128px;
-    }
-}
-
-@media (min-width: 1376px) {
-    .card-container {
-        width: 1316px;
-    }
-}
-
-@media (min-width: 1565px) {
-    .card-container {
-        width: 1505px;
-    }
-}
-</style>
diff --git a/src-vue/src/views/mods/LocalModsView.vue b/src-vue/src/views/mods/LocalModsView.vue
new file mode 100644
index 00000000..470ab4f7
--- /dev/null
+++ b/src-vue/src/views/mods/LocalModsView.vue
@@ -0,0 +1,122 @@
+<template>
+    <el-scrollbar>
+        <div>
+            <p v-if="mods.length === 0">No mods were found.</p>
+            <el-card v-else shadow="hover" v-for="mod in mods" v-bind:key="mod.name">
+                <el-switch style="--el-switch-on-color: #13ce66; --el-switch-off-color: #8957e5" v-model="mod.enabled"
+                            :before-change="() => updateWhichModsEnabled(mod)" :loading="global_load_indicator" />
+                <el-popconfirm
+                    title="Are you sure to delete this mod?"
+                    @confirm="deleteMod(mod)"
+                >
+                    <template #reference>
+                        <el-button type="danger">Delete</el-button>
+                    </template>
+                </el-popconfirm>
+                {{ mod.name }}
+            </el-card>
+        </div>
+    </el-scrollbar>
+</template>
+
+<script lang="ts">
+import { invoke } from '@tauri-apps/api';
+import { ElNotification } from 'element-plus';
+import { defineComponent } from 'vue';
+import { GameInstall } from '../../utils/GameInstall';
+import { NorthstarMod } from '../../utils/NorthstarMod';
+
+export default defineComponent({
+    name: 'LocalModsView',
+    computed: {
+        installedMods(): NorthstarMod[] {
+            return this.$store.state.installed_mods;
+        },
+        searchValue(): string {
+            return this.$store.getters.searchWords;
+        },
+        mods(): NorthstarMod[] {
+            if (this.searchValue.length === 0) {
+                return this.installedMods;
+            }
+
+            return this.installedMods.filter((mod: NorthstarMod) => {
+                return mod.name.toLowerCase().includes(this.searchValue);
+            });
+        }
+    },
+    data() {
+        return {
+            global_load_indicator: false,
+        };
+    },
+    methods: {
+        async updateWhichModsEnabled(mod: NorthstarMod) {
+            this.global_load_indicator = true;
+
+            // Setup up struct
+            let game_install = {
+                game_path: this.$store.state.game_path,
+                install_type: this.$store.state.install_type
+            } as GameInstall;
+
+            // enable/disable specific mod
+            try {
+                await invoke("set_mod_enabled_status", {
+                    gameInstall: game_install,
+                    modName: mod.name,
+                    // Need to set it to the opposite of current state,
+                    // as current state is only updated after command is run
+                    isEnabled: !mod.enabled,
+                })
+            }
+            catch (error) {
+                ElNotification({
+                    title: 'Error',
+                    message: `${error}`,
+                    type: 'error',
+                    position: 'bottom-right'
+                });
+                this.global_load_indicator = false;
+                return false;
+            }
+
+            this.global_load_indicator = false;
+            return true;
+        },
+        async deleteMod(mod: NorthstarMod) {
+            let game_install = {
+                game_path: this.$store.state.game_path,
+                install_type: this.$store.state.install_type
+            } as GameInstall;
+            await invoke("delete_northstar_mod", { gameInstall: game_install, nsmodName: mod.name })
+                .then((message) => {
+                    // Just a visual indicator that it worked
+                    ElNotification({
+                        title: `Success deleting ${mod.name}`,
+                        type: 'success',
+                        position: 'bottom-right'
+                    });
+                })
+                .catch((error) => {
+                    ElNotification({
+                        title: 'Error',
+                        message: error,
+                        type: 'error',
+                        position: 'bottom-right'
+                    });
+                })
+                .finally(() => {
+                    this.$store.commit('loadInstalledMods');
+                });
+        },
+    },
+    mounted() {
+        this.$store.commit('loadInstalledMods');
+    }
+})
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src-vue/src/views/mods/ThunderstoreModsView.vue b/src-vue/src/views/mods/ThunderstoreModsView.vue
new file mode 100644
index 00000000..aaf15220
--- /dev/null
+++ b/src-vue/src/views/mods/ThunderstoreModsView.vue
@@ -0,0 +1,272 @@
+<template>
+    <div class="fc-container" style="padding: 0">
+        <div v-if="mods.length === 0" class="fc__changelog__container">
+            <el-progress :show-text="false" :percentage="50" :indeterminate="true" />
+        </div>
+        <el-scrollbar v-else class="container" ref="scrollbar">
+            <div class="card-container">
+                <div class="pagination_container">
+                    <el-pagination
+                        v-if="shouldDisplayPagination"
+                        :currentPage="currentPageIndex + 1"
+                        layout="prev, pager, next"
+                        :page-size="modsPerPage"
+                        :total="modsList.length"
+                        @current-change="(e: number) => currentPageIndex = e - 1"
+                    />
+                </div>
+
+                <!-- Message displayed if no mod matched searched words -->
+                <div v-if="filteredMods.length === 0" class="modMessage">
+                    No matching mod has been found.<br/>
+                    Try another search!
+                </div>
+
+                <!-- Mod cards -->
+                <thunderstore-mod-card v-for="mod of currentPageMods" v-bind:key="mod.name" :mod="mod" />
+            </div>
+
+            <!-- Bottom pagination -->
+            <div class="card-container">
+                <div class="pagination_container">
+                    <el-pagination
+                        class="fc_bottom__pagination"
+                        v-if="shouldDisplayPagination"
+                        :currentPage="currentPageIndex + 1"
+                        layout="prev, pager, next"
+                        :page-size="modsPerPage"
+                        :total="modsList.length"
+                        @current-change="onBottomPaginationChange"
+                    />
+                </div>
+            </div>
+        </el-scrollbar>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref } from 'vue';
+import { ThunderstoreMod } from "../../utils/thunderstore/ThunderstoreMod";
+import ThunderstoreModCard from "../../components/ThunderstoreModCard.vue";
+import { ElScrollbar, ScrollbarInstance } from "element-plus";
+import { SortOptions } from "../../utils/SortOptions.d";
+import { ThunderstoreModVersion } from '../../utils/thunderstore/ThunderstoreModVersion';
+
+export default defineComponent({
+    name: "ThunderstoreModsView",
+    components: {ThunderstoreModCard},
+    async mounted() {
+        this.$store.commit('fetchThunderstoreMods');
+    },
+    computed: {
+        searchValue(): string {
+            return this.$store.getters.searchWords;
+        },
+        selectedCategories(): Object[] {
+            return this.$store.state.search.selectedCategories;
+        },
+        modSorting(): SortOptions {
+            return Object.values(SortOptions)[Object.keys(SortOptions).indexOf(this.$store.state.search.sortValue)];
+        },
+        mods(): ThunderstoreMod[] {
+            return this.$store.state.thunderstoreMods;
+        },
+        filteredMods(): ThunderstoreMod[] {
+            if (this.searchValue.length === 0 && this.selectedCategories.length === 0) {
+                return this.mods;
+            }
+
+            return this.mods.filter((mod: ThunderstoreMod) => {
+                // Filter with search words (only if search field isn't empty)
+                const inputMatches: boolean = this.searchValue.length === 0
+                    || (mod.name.toLowerCase().includes(this.searchValue)
+                        || mod.owner.toLowerCase().includes(this.searchValue)
+                        || mod.versions[0].description.toLowerCase().includes(this.searchValue));
+
+                // Filter with categories (only if some categories are selected)
+                const categoriesMatch: boolean = this.selectedCategories.length === 0
+                    || mod.categories
+                        .filter((category: string) => this.selectedCategories.includes(category))
+                        .length === this.selectedCategories.length;
+
+                return inputMatches && categoriesMatch;
+            });
+        },
+        modsList(): ThunderstoreMod[] {
+            // Use filtered mods if user is searching, vanilla list otherwise.
+            const mods: ThunderstoreMod[] = this.searchValue.length !== 0 || this.selectedCategories.length !== 0
+                ? this.filteredMods
+                : this.mods;
+
+            // Sort mods regarding user selected algorithm.
+            let compare: (a: ThunderstoreMod, b: ThunderstoreMod) => number;
+            switch(this.modSorting) {
+                case SortOptions.NAME_ASC:
+                    compare = (a: ThunderstoreMod, b: ThunderstoreMod) => a.name.localeCompare(b.name);
+                    break;
+                case SortOptions.NAME_DESC:
+                    compare = (a: ThunderstoreMod, b: ThunderstoreMod) => -1 * a.name.localeCompare(b.name);
+                    break;
+                case SortOptions.DATE_ASC:
+                    compare = (a: ThunderstoreMod, b: ThunderstoreMod) => a.date_updated.localeCompare(b.date_updated);
+                    break;
+                case SortOptions.DATE_DESC:
+                    compare = (a: ThunderstoreMod, b: ThunderstoreMod) => -1 * a.date_updated.localeCompare(b.date_updated);
+                    break;
+                case SortOptions.MOST_DOWNLOADED:
+                    compare = (a: ThunderstoreMod, b: ThunderstoreMod) => {
+                        const aTotal = a.versions.reduce((prev, next) => {
+                            return {downloads: prev.downloads + next.downloads} as ThunderstoreModVersion;
+                        }).downloads;
+                        const bTotal = b.versions.reduce((prev, next) => {
+                            return {downloads: prev.downloads + next.downloads} as ThunderstoreModVersion;
+                        }).downloads;
+                        return -1 * (aTotal - bTotal);
+                    };
+                    break;
+                case SortOptions.TOP_RATED:
+                    compare = (a: ThunderstoreMod, b: ThunderstoreMod) => -1 * (a.rating_score - b.rating_score);
+                    break;
+                default:
+                    throw new Error('Unknown mod sorting.');
+            }
+
+            return mods.sort(compare);
+        },
+        modsPerPage(): number {
+            return parseInt(this.$store.state.mods_per_page);
+        },
+        currentPageMods(): ThunderstoreMod[] {
+            // User might want to display all mods on one page.
+            const perPageValue = this.modsPerPage != 0 ? this.modsPerPage : this.modsList.length;
+
+            const startIndex = this.currentPageIndex * perPageValue;
+            const endIndexCandidate = startIndex + perPageValue;
+            const endIndex =  endIndexCandidate > this.modsList.length ? this.modsList.length : endIndexCandidate;
+            return this.modsList.slice(startIndex, endIndex);
+        },
+        shouldDisplayPagination(): boolean {
+            return this.modsPerPage != 0 && this.modsList.length > this.modsPerPage;
+        }
+    },
+    data() {
+        return {
+            modsBeingInstalled: [] as string[],
+            currentPageIndex: 0
+        };
+    },
+    methods: {
+        /**
+         * This updates current pagination and scrolls view to the top.
+         */
+        onBottomPaginationChange(index: number) {
+            this.currentPageIndex = index - 1;
+            (this.$refs.scrollbar as ScrollbarInstance).scrollTo({ top: 0, behavior: 'smooth' });
+        }
+    },
+    watch: {
+        searchValue(_: string, __: string) {
+            if (this.currentPageIndex !== 0) {
+                this.currentPageIndex = 0;
+            }
+        },
+        selectedCategories(_: string[], __: string[]) {
+            if (this.currentPageIndex !== 0) {
+                this.currentPageIndex = 0;
+            }
+        }
+    }
+});
+</script>
+
+<style scoped>
+.fc__changelog__container {
+    padding: 20px 30px;
+}
+
+.fc-container:deep(.el-scrollbar__view) {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+.el-timeline-item__timestamp {
+    color: white !important;
+    user-select: none !important;
+}
+
+.search {
+    display: inline-block;
+    margin: 0 0 0 10px !important;
+}
+
+.modMessage {
+    color: white;
+    margin: 20px 5px;
+}
+
+.card-container {
+    margin: 0 auto;
+}
+
+.pagination_container {
+    margin: 5px auto;
+    padding: 0 5px;
+    max-width: 1000px;
+    justify-content: center;
+    display: flex;
+}
+
+.el-pagination {
+    margin: 0;
+}
+
+.fc_bottom__pagination {
+    padding-bottom: 20px !important;
+    padding-right: 10px;
+}
+
+/* Card container dynamic size */
+
+.card-container {
+    --thunderstore-mod-card-width: 178px;
+    --thunderstore-mod-card-margin: 5px;
+    --thunderstore-mod-card-columns-count: 1;
+
+    width: calc(var(--thunderstore-mod-card-width) * var(--thunderstore-mod-card-columns-count) + var(--thunderstore-mod-card-margin) * 2 * var(--thunderstore-mod-card-columns-count));
+}
+@media (min-width: 628px) {
+    .card-container {
+        --thunderstore-mod-card-columns-count: 2;
+    }
+}
+@media (min-width: 836px) {
+    .card-container {
+        --thunderstore-mod-card-columns-count: 3;
+    }
+}
+@media (min-width: 1006px) {
+    .card-container {
+        --thunderstore-mod-card-columns-count: 4;
+    }
+}
+@media (min-width: 1196px) {
+    .card-container {
+        --thunderstore-mod-card-columns-count: 5;
+    }
+}
+@media (min-width: 1386px) {
+    .card-container {
+        --thunderstore-mod-card-columns-count: 6;
+    }
+}
+@media (min-width: 1576px) {
+    .card-container {
+        --thunderstore-mod-card-columns-count: 7;
+    }
+}
+@media (min-width: 1766px) {
+    .card-container {
+        --thunderstore-mod-card-columns-count: 8;
+    }
+}
+</style>
diff --git a/src-vue/tsconfig.json b/src-vue/tsconfig.json
index d4aefa2c..7f0f0012 100644
--- a/src-vue/tsconfig.json
+++ b/src-vue/tsconfig.json
@@ -10,7 +10,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "esModuleInterop": true,
-    "lib": ["ESNext", "DOM"],
+    "lib": ["ESNext", "DOM", "ES2018"],
     "skipLibCheck": true
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
-- 
cgit v1.2.3


From a5e71758b3d5b8315153e75f8bbf9e6cc4d3aa8a Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Sat, 14 Jan 2023 01:29:24 +0100
Subject: chore: Bump FlightCore version to 1.6.0

---
 src-tauri/Cargo.lock      | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 65133a9e..0376d592 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -81,7 +81,7 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
 name = "app"
-version = "1.5.0"
+version = "1.6.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 71c861fc..dcdf8d3b 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "1.5.0"
+version = "1.6.0"
 description = "A Tauri App"
 authors = ["you"]
 license = ""
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index ad7045b8..ca5ec9c3 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "FlightCore",
-    "version": "1.5.0"
+    "version": "1.6.0"
   },
   "tauri": {
     "allowlist": {
-- 
cgit v1.2.3


From 8eab75a03ce56a8522fc7504ebb0f01acd1c8d30 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <gecko.eidechse+git@pm.me>
Date: Sat, 14 Jan 2023 01:55:41 +0100
Subject: docs: Update download link to v1.6.0 of FlightCore

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4d3cf5d6..f4f2e7ff 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 	<img src="docs/assets/Square310x310Logo.png" width="200px">
 	<br>
 	<br>
-	<a href="https://github.com/R2NorthstarTools/FlightCore/releases/download/v1.5.0/FlightCore_1.5.0_x64_en-US.msi"><img src="docs/assets/downloadbutton.png" width="300px"></a>
+	<a href="https://github.com/R2NorthstarTools/FlightCore/releases/download/v1.6.0/FlightCore_1.6.0_x64_en-US.msi"><img src="docs/assets/downloadbutton.png" width="300px"></a>
 	<br>
 </p>
 
-- 
cgit v1.2.3


From 70c3a381018e7aca75f37086ba4702688ba5b28c Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:03:25 +0100
Subject: fix: Fix wrong comments (#138)

Typo and referencing wrong functionality
---
 src-vue/src/views/DeveloperView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-vue/src/views/DeveloperView.vue b/src-vue/src/views/DeveloperView.vue
index f199ddaf..6770caaa 100644
--- a/src-vue/src/views/DeveloperView.vue
+++ b/src-vue/src/views/DeveloperView.vue
@@ -162,7 +162,7 @@ export default defineComponent({
             } as GameInstall;
             let mod_to_install = this.mod_to_install_field_string;
             await invoke("install_mod_caller", { gameInstall: game_install, thunderstoreModString: mod_to_install }).then((message) => {
-                // Show user notificatio if mod install completed.
+                // Show user notification if mod install completed.
                 ElNotification({
                     title: `Installed ${mod_to_install}`,
                     message: message as string,
@@ -185,7 +185,7 @@ export default defineComponent({
                 install_type: this.$store.state.install_type
             } as GameInstall;
             await invoke("clean_up_download_folder_caller", { gameInstall: game_install, force: true }).then((message) => {
-                // Show user notificatio if mod install completed.
+                // Show user notification if task completed.
                 ElNotification({
                     title: `Done`,
                     message: `Done`,
-- 
cgit v1.2.3


From 2a9136fe520e5298d65603fc8804a7176b4719db Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Sun, 22 Jan 2023 18:46:47 +0100
Subject: fix: Properly parse mod string (#141)

---
 src-tauri/src/mod_management/mod.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index 008f72f0..e45fa3c1 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -284,8 +284,19 @@ async fn get_ns_mod_download_url(thunderstore_mod_string: String) -> Result<Stri
     // TODO: This will crash the thread if not internet connection exist. `match` should be used instead
     let index = thermite::api::get_package_index().await.unwrap().to_vec();
 
-    // String replace works but more care should be taken in the future
-    let ts_mod_string_url = thunderstore_mod_string.replace("-", "/");
+    // Parse mod string
+    let parsed_ts_mod_string: ParsedThunderstoreModString = match thunderstore_mod_string.parse() {
+        Ok(res) => res,
+        Err(_) => return Err("Failed to parse mod string".to_string()),
+    };
+
+    // Encode as URL
+    let ts_mod_string_url = format!(
+        "{}/{}/{}",
+        parsed_ts_mod_string.author_name,
+        parsed_ts_mod_string.mod_name,
+        parsed_ts_mod_string.version.unwrap()
+    );
 
     for ns_mod in index {
         // Iterate over all versions of a given mod
-- 
cgit v1.2.3


From 5ba596cc67856b0a6335130b1e43808adaba978e Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Sun, 22 Jan 2023 19:13:38 +0100
Subject: fix: Remove unused serde import in `main.rs` (#142)

fix: Remove unused serde import in main.rs

Seems like I forgot to remove it when I did some code refactoring
---
 src-tauri/src/main.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index b47a796e..0e62aa3c 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -30,7 +30,6 @@ use mod_management::{
 mod northstar;
 use northstar::get_northstar_version_number;
 
-use serde::{Deserialize, Serialize};
 use tauri::Manager;
 use tauri_plugin_store::PluginBuilder;
 use tokio::time::sleep;
-- 
cgit v1.2.3


From a69d79bb4be922faebd3b43fe2fd6d14d916ed16 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Sun, 22 Jan 2023 19:14:55 +0100
Subject: chore: Autoformat Rust source files (#143)

---
 src-tauri/src/main.rs                  |  7 ++++---
 src-tauri/src/mod_management/mod.rs    | 18 +++++++++---------
 src-tauri/src/repair_and_verify/mod.rs |  6 ++++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0e62aa3c..4eab7a00 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -9,7 +9,10 @@ use std::{
     time::Duration,
 };
 
-use app::{*, constants::{APP_USER_AGENT, MASTER_SERVER_URL, SERVER_BROWSER_ENDPOINT}};
+use app::{
+    constants::{APP_USER_AGENT, MASTER_SERVER_URL, SERVER_BROWSER_ENDPOINT},
+    *,
+};
 
 mod github;
 use github::release_notes::{
@@ -309,11 +312,9 @@ async fn clean_up_download_folder_caller(
     }
 }
 
-
 /// Gets server and playercount from master server API
 #[tauri::command]
 async fn get_server_player_count() -> Result<(i32, usize), String> {
-
     let url = format!("{MASTER_SERVER_URL}{SERVER_BROWSER_ENDPOINT}");
     let client = reqwest::Client::new();
     let res = client
diff --git a/src-tauri/src/mod_management/mod.rs b/src-tauri/src/mod_management/mod.rs
index e45fa3c1..c37882fe 100644
--- a/src-tauri/src/mod_management/mod.rs
+++ b/src-tauri/src/mod_management/mod.rs
@@ -184,7 +184,10 @@ fn parse_for_thunderstore_mod_string(nsmod_path: String) -> Result<String, anyho
     file.read_to_string(&mut thunderstore_author)?;
 
     // Build mod string
-    let thunderstore_mod_string = format!("{}-{}-{}", thunderstore_author, thunderstore_manifest.name, thunderstore_manifest.version_number);
+    let thunderstore_mod_string = format!(
+        "{}-{}-{}",
+        thunderstore_author, thunderstore_manifest.name, thunderstore_manifest.version_number
+    );
 
     Ok(thunderstore_mod_string)
 }
@@ -226,11 +229,10 @@ fn parse_installed_mods(game_install: GameInstall) -> Result<Vec<NorthstarMod>,
             }
         };
         // Get Thunderstore mod string if it exists
-        let thunderstore_mod_string =
-            match parse_for_thunderstore_mod_string(directory_str) {
-                Ok(thunderstore_mod_string) => Some(thunderstore_mod_string),
-                Err(_err) => None,
-            };
+        let thunderstore_mod_string = match parse_for_thunderstore_mod_string(directory_str) {
+            Ok(thunderstore_mod_string) => Some(thunderstore_mod_string),
+            Err(_err) => None,
+        };
         // Get directory path
         let mod_directory = directory.to_str().unwrap().to_string();
 
@@ -409,13 +411,11 @@ pub async fn fc_download_mod_and_install(
     let author = thunderstore_mod_string.split("-").next().unwrap();
 
     // Extract the mod to the mods directory
-    match thermite::core::manage::install_mod(author, &f, std::path::Path::new(&mods_directory))
-    {
+    match thermite::core::manage::install_mod(author, &f, std::path::Path::new(&mods_directory)) {
         Ok(()) => (),
         Err(err) => return Err(err.to_string()),
     };
 
-
     // Delete downloaded zip file
     std::fs::remove_file(path).unwrap();
 
diff --git a/src-tauri/src/repair_and_verify/mod.rs b/src-tauri/src/repair_and_verify/mod.rs
index 393a8cdd..fb108f37 100644
--- a/src-tauri/src/repair_and_verify/mod.rs
+++ b/src-tauri/src/repair_and_verify/mod.rs
@@ -1,4 +1,7 @@
-use crate::{mod_management::{set_mod_enabled_status, rebuild_enabled_mods_json}, northstar::CORE_MODS};
+use crate::{
+    mod_management::{rebuild_enabled_mods_json, set_mod_enabled_status},
+    northstar::CORE_MODS,
+};
 use anyhow::anyhow;
 /// Contains various functions to repair common issues and verifying installation
 use app::{get_enabled_mods, GameInstall};
@@ -14,7 +17,6 @@ pub fn verify_game_files(game_install: GameInstall) -> Result<String, String> {
 /// Enables core mods if disabled
 #[tauri::command]
 pub fn disable_all_but_core(game_install: GameInstall) -> Result<(), String> {
-
     // Rebuild `enabledmods.json` first to ensure all mods are added
     rebuild_enabled_mods_json(game_install.clone())?;
 
-- 
cgit v1.2.3


From 31b32c725ce4f47a6726cb0d8ef5f21ec6030580 Mon Sep 17 00:00:00 2001
From: Rémy Raes <contact@remyraes.com>
Date: Sun, 29 Jan 2023 13:28:32 +0100
Subject: fix: Set current route as menu active item (#149)

fix: set current route as menu active item
---
 src-vue/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-vue/src/App.vue b/src-vue/src/App.vue
index 0ecea16d..c28919e1 100644
--- a/src-vue/src/App.vue
+++ b/src-vue/src/App.vue
@@ -50,7 +50,7 @@ export default {
     <nav id="fc_menu-bar">
       <!-- Navigation items -->
       <el-menu
-        default-active="/"
+        :default-active="$route.path"
         router
         mode="horizontal"
         id="fc__menu_items"
-- 
cgit v1.2.3