chore(docs/labrinth): remove unnecessary trailing spaces in lines

These don't serve an useful purpose, and overall the Markdown source
looks less tidy with them.

.editorconfig

@@ -4,7 +4,7 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
@@ -13,3 +13,6 @@ max_line_length = 100
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.{rs,java,kts}]
+indent_size = 4

apps/app/nsis/hooks.nsi

@@ -1,67 +1,41 @@
-; https://nsis.sourceforge.io/ShellExecWait
-!macro ShellExecWait verb app param workdir show exitoutvar ;only app and show must be != "", every thing else is optional
-    #define SEE_MASK_NOCLOSEPROCESS 0x40
-    System::Store S
-    !if "${NSIS_PTR_SIZE}" > 4
-    !define /ReDef /math SYSSIZEOF_SHELLEXECUTEINFO 14 * ${NSIS_PTR_SIZE}
-    !else ifndef SYSSIZEOF_SHELLEXECUTEINFO
-    !define SYSSIZEOF_SHELLEXECUTEINFO 60
-    !endif
-    System::Call '*(&i${SYSSIZEOF_SHELLEXECUTEINFO})i.r0'
-    System::Call '*$0(i ${SYSSIZEOF_SHELLEXECUTEINFO},i 0x40,p $hwndparent,t "${verb}",t $\'${app}$\',t $\'${param}$\',t "${workdir}",i ${show})p.r0'
-    System::Call 'shell32::ShellExecuteEx(t)(pr0)i.r1 ?e' ; (t) to trigger A/W selection
-    ${If} $1 <> 0
-        System::Call '*$0(is,i,p,p,p,p,p,p,p,p,p,p,p,p,p.r1)' ;stack value not really used, just a fancy pop ;)
-        System::Call 'kernel32::WaitForSingleObject(pr1,i-1)'
-        System::Call 'kernel32::GetExitCodeProcess(pr1,*i.s)'
-        System::Call 'kernel32::CloseHandle(pr1)'
-    ${EndIf}
-    System::Free $0
-    !if "${exitoutvar}" == ""
-        pop $0
-    !endif
-    System::Store L
-    !if "${exitoutvar}" != ""
-        pop ${exitoutvar}
-    !endif
-!macroend
-
-; --------------------------------------------------------------------------------
-
-Var /GLOBAL OldInstallDir
-
-!macro NSIS_HOOK_PREINSTALL
-    SetShellVarContext all
-    ${If} ${FileExists} "$SMPROGRAMS\${PRODUCTNAME}.lnk"
-        UserInfo::GetAccountType
-        Pop $0
-        ${If} $0 != "Admin"
-            MessageBox MB_ICONINFORMATION|MB_OK "An old installation of the Modrinth App was detected that requires administrator permission to update from. You will be prompted with an admin prompt shortly."
-        ${EndIf}
-
-        ReadRegStr $4 SHCTX "${MANUPRODUCTKEY}" ""
-        ReadRegStr $R1 SHCTX "${UNINSTKEY}" "UninstallString"
-
-        ReadRegStr $OldInstallDir SHCTX "${UNINSTKEY}" "InstallLocation"
-        StrCpy $OldInstallDir $OldInstallDir "" 1
-        StrCpy $OldInstallDir $OldInstallDir -1 ""
-
-        DetailPrint "Executing $R1"
-        !insertmacro ShellExecWait "runas" '$R1' '/P _?=$4' "" ${SW_SHOW} $3
-        ${If} $3 <> 0
-            SetErrorLevel $3
-            MessageBox MB_ICONEXCLAMATION|MB_OK "Failed to uninstall old global installation"
-            Abort
-        ${EndIf}
-    ${EndIf}
-    SetShellVarContext current
-!macroend
-
 !macro NSIS_HOOK_POSTINSTALL
-    !insertmacro IsShortcutTarget "$DESKTOP\${PRODUCTNAME}.lnk" "$OldInstallDir\${MAINBINARYNAME}.exe"
-    Pop $0
-    ${If} $0 = 1
-        !insertmacro SetShortcutTarget "$DESKTOP\${PRODUCTNAME}.lnk" "$INSTDIR\${MAINBINARYNAME}.exe"
-        Return
-    ${EndIf}
+    SetShellVarContext current
+
+    IfFileExists "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe" file_found file_not_found
+    file_found:
+        Delete "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+
+        Delete "$LOCALAPPDATA${PRODUCTNAME}\uninstall.exe"
+        RMDir "$LOCALAPPDATA${PRODUCTNAME}"
+
+        !insertmacro DeleteAppUserModelId
+
+        ; Remove start menu shortcut
+        !insertmacro MUI_STARTMENU_GETFOLDER Application $AppStartMenuFolder
+        !insertmacro IsShortcutTarget "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+        Pop $0
+        ${If} $0 = 1
+          !insertmacro UnpinShortcut "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk"
+          Delete "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk"
+          RMDir "$SMPROGRAMS$AppStartMenuFolder"
+        ${EndIf}
+        !insertmacro IsShortcutTarget "$SMPROGRAMS${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+        Pop $0
+        ${If} $0 = 1
+          !insertmacro UnpinShortcut "$SMPROGRAMS${PRODUCTNAME}.lnk"
+          Delete "$SMPROGRAMS${PRODUCTNAME}.lnk"
+        ${EndIf}
+
+        !insertmacro IsShortcutTarget "$DESKTOP${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+        Pop $0
+        ${If} $0 = 1
+          !insertmacro UnpinShortcut "$DESKTOP${PRODUCTNAME}.lnk"
+          Delete "$DESKTOP${PRODUCTNAME}.lnk"
+        ${EndIf}
+
+        DeleteRegKey HKCU "${UNINSTKEY}"
+
+        goto end_of_test ;<== important for not continuing on the else branch
+    file_not_found:
+    end_of_test:
 !macroend

apps/app/tauri.conf.json

@@ -15,6 +15,7 @@
     "icon": ["icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
     "windows": {
       "nsis": {
+        "installMode": "perMachine",
         "installerHooks": "./nsis/hooks.nsi"
       }
     },

apps/docs/src/content/docs/contributing/labrinth.md

@@ -62,18 +62,18 @@ During development, you might notice that changes made directly to entities in t
 
 #### Basic configuration
 
-`DEBUG`: Whether debugging tools should be enabled  
-`RUST_LOG`: Specifies what information to log, from rust's [`env-logger`](https://github.com/env-logger-rs/env_logger); a reasonable default is `info,sqlx::query=warn`  
-`SITE_URL`: The main URL to be used for CORS  
-`CDN_URL`: The publicly accessible base URL for files uploaded to the CDN  
-`MODERATION_DISCORD_WEBHOOK`: The URL for a Discord webhook where projects pending approval will be sent  
-`CLOUDFLARE_INTEGRATION`: Whether labrinth should integrate with Cloudflare's spam protection  
-`DATABASE_URL`: The URL for the PostgreSQL database  
-`DATABASE_MIN_CONNECTIONS`: The minimum number of concurrent connections allowed to the database at the same time  
-`DATABASE_MAX_CONNECTIONS`: The maximum number of concurrent connections allowed to the database at the same time  
-`MEILISEARCH_ADDR`: The URL for the MeiliSearch instance used for search  
-`MEILISEARCH_KEY`: The name that MeiliSearch is given  
-`BIND_ADDR`: The bind address for the server. Supports both IPv4 and IPv6  
+`DEBUG`: Whether debugging tools should be enabled
+`RUST_LOG`: Specifies what information to log, from rust's [`env-logger`](https://github.com/env-logger-rs/env_logger); a reasonable default is `info,sqlx::query=warn`
+`SITE_URL`: The main URL to be used for CORS
+`CDN_URL`: The publicly accessible base URL for files uploaded to the CDN
+`MODERATION_DISCORD_WEBHOOK`: The URL for a Discord webhook where projects pending approval will be sent
+`CLOUDFLARE_INTEGRATION`: Whether Labrinth should integrate with Cloudflare's spam protection
+`DATABASE_URL`: The URL for the PostgreSQL database, including its username, password, host, port, and database name
+`DATABASE_MIN_CONNECTIONS`: The minimum number of concurrent connections allowed to the database at the same time
+`DATABASE_MAX_CONNECTIONS`: The maximum number of concurrent connections allowed to the database at the same time
+`MEILISEARCH_ADDR`: The URL for the MeiliSearch instance used for search
+`MEILISEARCH_KEY`: The name that MeiliSearch is given
+`BIND_ADDR`: The bind address for the server. Supports both IPv4 and IPv6
 `MOCK_FILE_PATH`: The path used to store uploaded files; this has no default value and will panic if unspecified
 `SMTP_USERNAME`: The username used to authenticate with the SMTP server
 `SMTP_PASSWORD`: The password associated with the `SMTP_USERNAME` for SMTP authentication
@@ -90,7 +90,7 @@ The S3 configuration options are fairly self-explanatory in name, so here's simp
 
 #### Search, OAuth, and miscellaneous options
 
-`LOCAL_INDEX_INTERVAL`: The interval, in seconds, at which the local database is reindexed for searching. Defaults to `3600` seconds (1 hour).  
+`LOCAL_INDEX_INTERVAL`: The interval, in seconds, at which the local database is reindexed for searching. Defaults to `3600` seconds (1 hour).
 `VERSION_INDEX_INTERVAL`: The interval, in seconds, at which versions are reindexed for searching. Defaults to `1800` seconds (30 minutes).
 
 The OAuth configuration options are fairly self-explanatory. For help setting up authentication, please contact us on [Discord].
@@ -99,8 +99,8 @@ The OAuth configuration options are fairly self-explanatory. For help setting up
 
 #### Command line options
 
-`--skip-first-index`: Skips indexing the local database on startup. This is useful to prevent doing unnecessary work when frequently restarting.  
-`--reconfigure-indices`: Resets the MeiliSearch settings for the search indices and exits.  
+`--skip-first-index`: Skips indexing the local database on startup. This is useful to prevent doing unnecessary work when frequently restarting.
+`--reconfigure-indices`: Resets the MeiliSearch settings for the search indices and exits.
 `--reset-indices`: Resets the MeiliSearch indices and exits; this clears all previously indexed mods.
 
 </details>
@@ -114,7 +114,7 @@ If you're prepared to contribute by submitting a pull request, ensure you have m
 - `cargo check` has been run.
 - `cargo sqlx prepare` has been run.
 
-> Note: If you encounter issues with `sqlx` saying 'no queries found' after running `cargo sqlx prepare`, you may need to ensure the installed version of `sqlx-cli` matches the current version of `sqlx` used [in labrinth](https://github.com/modrinth/labrinth/blob/master/Cargo.toml).
+> Note: If you encounter issues with `sqlx` saying 'no queries found' after running `cargo sqlx prepare`, you may need to ensure the installed version of `sqlx-cli` matches the current version of `sqlx` used [in Labrinth](https://github.com/modrinth/labrinth/blob/master/Cargo.toml).
 
 [Discord]: https://discord.modrinth.com
 [GitHub]: https://github.com/modrinth