Lightemerald/hydra
1
0
Fork 0
mirror of https://github.com/hydralauncher/hydra.git synced 2026-01-25 20:01:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/auto-install-on-linux-and-friend-request-notification

Browse Source 
# Conflicts:
#	src/locales/pt-PT/translation.json
This commit is contained in:
Zamitto
2025-03-15 11:43:35 -03:00
parent 61b2710219 bd77aee3c2
commit 72cde368f5
6 changed files with 222 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/services/cloud-sync.ts
View File

@@ -13,7 +13,6 @@ import { logger } from "./logger";
import { WindowManager } from "./window-manager";
import axios from "axios";
import { Ludusavi } from "./ludusavi";
import { isFuture, isToday } from "date-fns";
import { SubscriptionRequiredError } from "@shared";
export class CloudSync {
@@ -54,8 +53,8 @@ export class CloudSync {
const hasActiveSubscription = await db
.get<string, User>(levelKeys.user, { valueEncoding: "json" })
.then((user) => {
const expiresAt = user?.subscription?.expiresAt;
return expiresAt && (isFuture(expiresAt) || isToday(expiresAt));
const expiresAt = new Date(user?.subscription?.expiresAt ?? 0);
return expiresAt > new Date();
});
if (!hasActiveSubscription) {

5
src/main/services/hydra-api.ts
View File

@@ -8,7 +8,6 @@ import { UserNotLoggedInError, SubscriptionRequiredError } from "@shared";
import { omit } from "lodash-es";
import { appVersion } from "@main/constants";
import { getUserData } from "./user/get-user-data";
import { isFuture, isToday } from "date-fns";
import { db } from "@main/level";
import { levelKeys } from "@main/level/sublevels";
import type { Auth, User } from "@types";
@@ -47,8 +46,8 @@ export class HydraApi {
}
private static hasActiveSubscription() {
const expiresAt = this.userAuth.subscription?.expiresAt;
return expiresAt && (isFuture(expiresAt) || isToday(expiresAt));
const expiresAt = new Date(this.userAuth.subscription?.expiresAt ?? 0);
return expiresAt > new Date();
}
static async handleExternalAuth(uri: string) {