fix for main origin 575a5adbeff0b46390fb08901c7166649255204c
This commit is contained in:
11 files changed
+1008
-703
No files matched your search
@@ -0,0 +1,60 @@
|
||||
diff --git a/fluxer_desktop/package.json b/fluxer_desktop/package.json
|
||||
index e1b4f22..dd0cc08 100644
|
||||
--- a/fluxer_desktop/package.json
|
||||
+++ b/fluxer_desktop/package.json
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "fluxer_desktop",
|
||||
"version": "0.0.0",
|
||||
"description": "Instant messaging and VoIP application",
|
||||
- "homepage": "https://fluxer.app",
|
||||
+ "homepage": "https://ds.gandc.ru",
|
||||
"author": "Fluxer Platform AB <support@fluxer.com>",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"private": true,
|
||||
diff --git a/fluxer_desktop/src/common/Constants.ts b/fluxer_desktop/src/common/Constants.ts
|
||||
index 04709f7..6fdcff1 100644
|
||||
--- a/fluxer_desktop/src/common/Constants.ts
|
||||
+++ b/fluxer_desktop/src/common/Constants.ts
|
||||
@@ -14,8 +14,8 @@ export const CHANNEL_APP_PROTOCOLS: Record<BuildChannel, string> = {
|
||||
development: 'fluxer-development',
|
||||
};
|
||||
export const APP_PROTOCOL = CHANNEL_APP_PROTOCOLS[BUILD_CHANNEL];
|
||||
-export const STABLE_APP_URL = 'https://web.fluxer.app';
|
||||
-export const CANARY_APP_URL = 'https://web.canary.fluxer.app';
|
||||
+export const STABLE_APP_URL = 'https://ds.gandc.ru';
|
||||
+export const CANARY_APP_URL = 'https://ds.gandc.ru';
|
||||
const DEVELOPMENT_APP_URL = 'http://localhost:8088';
|
||||
export const CHANNEL_APP_URLS: Record<BuildChannel, string> = {
|
||||
stable: STABLE_APP_URL,
|
||||
@@ -28,8 +28,8 @@ export const DOWNLOAD_PAGE_URLS: Record<BuildChannel, string> = {
|
||||
canary: 'https://canary.fluxer.app/download',
|
||||
development: 'http://localhost:8088/download',
|
||||
};
|
||||
-export const STABLE_MIGRATED_APP_ORIGIN = 'https://fluxer.com';
|
||||
-export const CANARY_MIGRATED_APP_ORIGIN = 'https://canary.fluxer.com';
|
||||
+export const STABLE_MIGRATED_APP_ORIGIN = 'https://ds.gandc.ru';
|
||||
+export const CANARY_MIGRATED_APP_ORIGIN = 'https://ds.gandc.ru';
|
||||
export const DESKTOP_APP_SCHEME = DESKTOP_LOCAL_APP_SCHEME;
|
||||
export const DESKTOP_APP_HOST = DESKTOP_LOCAL_APP_HOST;
|
||||
export const DESKTOP_APP_ORIGIN = DESKTOP_LOCAL_APP_ORIGIN;
|
||||
diff --git a/fluxer_desktop/src/main/DesktopRuntimeDiscovery.ts b/fluxer_desktop/src/main/DesktopRuntimeDiscovery.ts
|
||||
index 3b23773..ddcc993 100644
|
||||
--- a/fluxer_desktop/src/main/DesktopRuntimeDiscovery.ts
|
||||
+++ b/fluxer_desktop/src/main/DesktopRuntimeDiscovery.ts
|
||||
@@ -1,5 +1,7 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
+import {BUILD_CHANNEL} from '@electron/common/BuildChannel';
|
||||
+import {CHANNEL_APP_URLS} from '@electron/common/Constants';
|
||||
import {getLaunchInstanceEndpointOverride} from '@electron/common/DesktopConfig';
|
||||
import {createChildLogger} from '@electron/common/Logger';
|
||||
import {getDesktopAppStorage} from '@electron/main/DesktopAppStorage';
|
||||
@@ -140,7 +142,7 @@ export async function restoreRememberedRuntimePlan(instanceKey: string): Promise
|
||||
}
|
||||
|
||||
export function desktopRuntimeInitialInput(): string | null {
|
||||
- return getLaunchInstanceEndpointOverride();
|
||||
+ return getLaunchInstanceEndpointOverride() ?? CHANNEL_APP_URLS[BUILD_CHANNEL];
|
||||
}
|
||||
|
||||
async function fetchRuntimePlan(
|
||||
Reference in new issue
Block a user