Merge branch 'hydralauncher:main' into main

This commit is contained in:
expload 2024-10-31 15:51:45 +08:00 committed by GitHub
commit 25e1a15828
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 13 additions and 19 deletions

View File

@ -1,5 +1,5 @@
name: Bug Report name: Bug Report
description: Create a report to help us improve. Write in English, please. description: Create a report to help us improve. Write in English.
title: "[BUG] Write a title for your bug" title: "[BUG] Write a title for your bug"
labels: ["bug"] labels: ["bug"]
body: body:
@ -61,3 +61,5 @@ body:
required: true required: true
- label: I am aware that Hydra team does not offer any support or help regarding the downloaded games. - label: I am aware that Hydra team does not offer any support or help regarding the downloaded games.
required: true required: true
- label: I have read the [Frequently Asked Questions (FAQ)](https://github.com/hydralauncher/hydra/wiki/FAQ).
required: true

View File

@ -1,6 +1,6 @@
{ {
"name": "hydralauncher", "name": "hydralauncher",
"version": "3.0.3", "version": "3.0.4",
"description": "Hydra", "description": "Hydra",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "Los Broxas", "author": "Los Broxas",

File diff suppressed because one or more lines are too long

View File

@ -312,7 +312,7 @@
"sending": "Saatmine", "sending": "Saatmine",
"friend_request_sent": "Sõbrakutse saadetud", "friend_request_sent": "Sõbrakutse saadetud",
"friends": "Sõbrad", "friends": "Sõbrad",
"friends_list": "Sõbrade nimekiri", "friends_list": "Sõprade nimekiri",
"user_not_found": "Kasutajat ei leitud", "user_not_found": "Kasutajat ei leitud",
"block_user": "Blokeeri kasutaja", "block_user": "Blokeeri kasutaja",
"add_friend": "Lisa sõbraks", "add_friend": "Lisa sõbraks",

View File

@ -57,14 +57,14 @@
"remove_from_library": "Supprimer de la bibliothèque", "remove_from_library": "Supprimer de la bibliothèque",
"no_downloads": "Aucun téléchargement disponible", "no_downloads": "Aucun téléchargement disponible",
"next_suggestion": "Suggestion suivante", "next_suggestion": "Suggestion suivante",
"play_time": "Joué pour {{montant}}", "play_time": "Joué pour {{amount}}",
"install": "Installer", "install": "Installer",
"play": "Jouer", "play": "Jouer",
"not_played_yet": "Vous n'avez pas encore joué à {{title}}", "not_played_yet": "Vous n'avez pas encore joué à {{title}}",
"close": "Fermer", "close": "Fermer",
"deleting": "Suppression du programme d'installation…", "deleting": "Suppression du programme d'installation…",
"playing_now": "Jeu en cours", "playing_now": "Jeu en cours",
"last_time_played": "Dernièrement joué {{période}}" "last_time_played": "Dernièrement joué {{period}}"
}, },
"activation": { "activation": {
"title": "Activer Hydra", "title": "Activer Hydra",

View File

@ -219,7 +219,6 @@ export class AchievementWatcherManager {
const games = await gameRepository.find({ const games = await gameRepository.find({
where: { where: {
isDeleted: false, isDeleted: false,
winePrefixPath: Not(IsNull()),
}, },
}); });

View File

@ -8,7 +8,6 @@ import { HydraApi } from "../hydra-api";
import { getUnlockedAchievements } from "@main/events/user/get-unlocked-achievements"; import { getUnlockedAchievements } from "@main/events/user/get-unlocked-achievements";
import { Game } from "@main/entity"; import { Game } from "@main/entity";
import { achievementsLogger } from "../logger"; import { achievementsLogger } from "../logger";
import { SubscriptionRequiredError } from "@shared";
const saveAchievementsOnLocal = async ( const saveAchievementsOnLocal = async (
objectId: string, objectId: string,
@ -119,14 +118,10 @@ export const mergeAchievements = async (
const mergedLocalAchievements = unlockedAchievements.concat(newAchievements); const mergedLocalAchievements = unlockedAchievements.concat(newAchievements);
if (game.remoteId) { if (game.remoteId) {
await HydraApi.put( await HydraApi.put("/profile/games/achievements", {
"/profile/games/achievements", id: game.remoteId,
{ achievements: mergedLocalAchievements,
id: game.remoteId, })
achievements: mergedLocalAchievements,
},
{ needsSubscription: true }
)
.then((response) => { .then((response) => {
return saveAchievementsOnLocal( return saveAchievementsOnLocal(
response.objectId, response.objectId,
@ -136,9 +131,7 @@ export const mergeAchievements = async (
); );
}) })
.catch((err) => { .catch((err) => {
if (!(err instanceof SubscriptionRequiredError)) { achievementsLogger.error(err);
achievementsLogger.error(err);
}
return saveAchievementsOnLocal( return saveAchievementsOnLocal(
game.objectID, game.objectID,