Merge branch 'main' of github.com:hydralauncher/hydra

src/locales/en/translation.json

@@ -255,7 +255,8 @@
     "blocked_users": "Blocked users",
     "user_unblocked": "User has been unblocked",
     "enable_achievement_notifications": "When an achievement is unlocked",
-    "launch_minimized": "Launch Hydra minimized"
+    "launch_minimized": "Launch Hydra minimized",
+    "disable_nsfw_alert": "Disable NSFW alert"
   },
   "notifications": {
     "download_complete": "Download complete",

src/locales/pt-BR/translation.json

@@ -251,7 +251,8 @@
     "blocked_users": "Usuários bloqueados",
     "user_unblocked": "Usuário desbloqueado",
     "enable_achievement_notifications": "Quando uma conquista é desbloqueada",
-    "launch_minimized": "Iniciar o Hydra minimizado"
+    "launch_minimized": "Iniciar o Hydra minimizado",
+    "disable_nsfw_alert": "Desativar alerta de conteúdo inapropriado"
   },
   "notifications": {
     "download_complete": "Download concluído",

src/main/constants.ts

@@ -5,12 +5,12 @@ export const LUDUSAVI_MANIFEST_URL = "https://cdn.losbroxas.org/manifest.yaml";
 
 export const defaultDownloadsPath = app.getPath("downloads");
 
+export const isStaging = import.meta.env.MAIN_VITE_API_URL.includes("staging");
+
 export const databaseDirectory = path.join(app.getPath("appData"), "hydra");
 export const databasePath = path.join(
   databaseDirectory,
-  import.meta.env.MAIN_VITE_API_URL.includes("staging")
-    ? "hydra_test.db"
-    : "hydra.db"
+  isStaging ? "hydra_test.db" : "hydra.db"
 );
 
 export const logsPath = path.join(app.getPath("appData"), "hydra", "logs");
@@ -25,4 +25,4 @@ export const achievementSoundPath = app.isPackaged
 
 export const backupsPath = path.join(app.getPath("userData"), "Backups");
 
-export const appVersion = app.getVersion();
+export const appVersion = app.getVersion() + (isStaging ? "-staging" : "");

src/main/entity/user-preferences.entity.ts

@@ -38,6 +38,9 @@ export class UserPreferences {
   @Column("boolean", { default: false })
   startMinimized: boolean;
 
+  @Column("boolean", { default: false })
+  disableNsfwAlert: boolean;
+
   @CreateDateColumn()
   createdAt: Date;
 

src/main/events/misc/open-checkout.ts

@@ -1,10 +1,16 @@
 import { shell } from "electron";
 import { registerEvent } from "../register-event";
-import { userAuthRepository } from "@main/repository";
+import {
+  userAuthRepository,
+  userPreferencesRepository,
+} from "@main/repository";
 import { HydraApi } from "@main/services";
 
 const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
-  const userAuth = await userAuthRepository.findOne({ where: { id: 1 } });
+  const [userAuth, userPreferences] = await Promise.all([
+    userAuthRepository.findOne({ where: { id: 1 } }),
+    userPreferencesRepository.findOne({ where: { id: 1 } }),
+  ]);
 
   if (!userAuth) {
     return;
@@ -16,6 +22,7 @@ const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
 
   const params = new URLSearchParams({
     token: paymentToken,
+    lng: userPreferences?.language || "en",
   });
 
   shell.openExternal(

src/main/knex-client.ts

@@ -12,6 +12,7 @@ import { CreateUserSubscription } from "./migrations/20241015235142_create_user_
 import { AddBackgroundImageUrl } from "./migrations/20241016100249_add_background_image_url";
 import { AddWinePrefixToGame } from "./migrations/20241019081648_add_wine_prefix_to_game";
 import { AddStartMinimizedColumn } from "./migrations/20241030171454_add_start_minimized_column";
+import { AddDisableNsfwAlertColumn } from "./migrations/20241106053733_add_disable_nsfw_alert_column";
 export type HydraMigration = Knex.Migration & { name: string };
 
 class MigrationSource implements Knex.MigrationSource<HydraMigration> {
@@ -28,6 +29,7 @@ class MigrationSource implements Knex.MigrationSource<HydraMigration> {
       AddBackgroundImageUrl,
       AddWinePrefixToGame,
       AddStartMinimizedColumn,
+      AddDisableNsfwAlertColumn,
     ]);
   }
   getMigrationName(migration: HydraMigration): string {

src/main/migrations/20241106053733_add_disable_nsfw_alert_column.ts

@@ -0,0 +1,17 @@
+import type { HydraMigration } from "@main/knex-client";
+import type { Knex } from "knex";
+
+export const AddDisableNsfwAlertColumn: HydraMigration = {
+  name: "AddDisableNsfwAlertColumn",
+  up: (knex: Knex) => {
+    return knex.schema.alterTable("user_preferences", (table) => {
+      return table.boolean("disableNsfwAlert").notNullable().defaultTo(0);
+    });
+  },
+
+  down: async (knex: Knex) => {
+    return knex.schema.alterTable("user_preferences", (table) => {
+      return table.dropColumn("disableNsfwAlert");
+    });
+  },
+};

src/main/services/hydra-api.ts

@@ -112,6 +112,8 @@ export class HydraApi {
       expirationTimestamp: 0,
       subscription: null,
     };
+
+    this.post("/auth/logout", {}, { needsAuth: false }).catch(() => {});
   }
 
   static async setupApi() {

src/renderer/src/app.tsx

@@ -36,8 +36,6 @@ export interface AppProps {
   children: React.ReactNode;
 }
 
-console.log(import.meta.env);
-
 Intercom({
   app_id: import.meta.env.RENDERER_VITE_INTERCOM_APP_ID,
 });