diff options
-rw-r--r-- | src/api/server/ServerApi.js | 8 | ||||
-rw-r--r-- | src/api/utils/auth.js | 6 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 | ||||
-rw-r--r-- | src/environment.js | 1 | ||||
-rw-r--r-- | src/features/announcements/api.js | 4 | ||||
-rw-r--r-- | src/stores/AppStore.js | 3 | ||||
-rw-r--r-- | src/stores/ServicesStore.js | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index bc0b0dff9..a55997b9d 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { join } from 'path'; | 1 | import { join } from 'path'; |
2 | import tar from 'tar'; | 2 | import tar from 'tar'; |
3 | import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra'; | 3 | import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra'; |
4 | import { app, require as remoteRequire } from '@electron/remote'; | 4 | import { require as remoteRequire } from '@electron/remote'; |
5 | 5 | ||
6 | import ServiceModel from '../../models/Service'; | 6 | import ServiceModel from '../../models/Service'; |
7 | import RecipePreviewModel from '../../models/RecipePreview'; | 7 | import RecipePreviewModel from '../../models/RecipePreview'; |
@@ -13,7 +13,7 @@ import OrderModel from '../../models/Order'; | |||
13 | import { sleep } from '../../helpers/async-helpers'; | 13 | import { sleep } from '../../helpers/async-helpers'; |
14 | 14 | ||
15 | import { SERVER_NOT_LOADED } from '../../config'; | 15 | import { SERVER_NOT_LOADED } from '../../config'; |
16 | import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath } from '../../environment'; | 16 | import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment'; |
17 | import apiBase from '../apiBase'; | 17 | import apiBase from '../apiBase'; |
18 | import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; | 18 | import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; |
19 | 19 | ||
@@ -435,9 +435,7 @@ export default class ServerApi { | |||
435 | 435 | ||
436 | // News | 436 | // News |
437 | async getLatestNews() { | 437 | async getLatestNews() { |
438 | const url = `${apiBase( | 438 | const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`; |
439 | true, | ||
440 | )}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`; | ||
441 | const request = await sendAuthRequest(url); | 439 | const request = await sendAuthRequest(url); |
442 | if (!request.ok) throw request; | 440 | if (!request.ok) throw request; |
443 | const data = await request.json(); | 441 | const data = await request.json(); |
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js index 9f718f171..e493b2962 100644 --- a/src/api/utils/auth.js +++ b/src/api/utils/auth.js | |||
@@ -1,5 +1,5 @@ | |||
1 | import { app } from '@electron/remote'; | ||
2 | import localStorage from 'mobx-localstorage'; | 1 | import localStorage from 'mobx-localstorage'; |
2 | import { ferdiLocale, ferdiVersion } from '../../environment'; | ||
3 | 3 | ||
4 | export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => { | 4 | export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => { |
5 | const request = Object.assign(options, { | 5 | const request = Object.assign(options, { |
@@ -7,10 +7,10 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => | |||
7 | headers: { | 7 | headers: { |
8 | 'Content-Type': 'application/json', | 8 | 'Content-Type': 'application/json', |
9 | 'X-Franz-Source': 'desktop', | 9 | 'X-Franz-Source': 'desktop', |
10 | 'X-Franz-Version': app.getVersion(), | 10 | 'X-Franz-Version': ferdiVersion, |
11 | 'X-Franz-platform': process.platform, | 11 | 'X-Franz-platform': process.platform, |
12 | 'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(), | 12 | 'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(), |
13 | 'X-Franz-System-Locale': app.getLocale(), | 13 | 'X-Franz-System-Locale': ferdiLocale, |
14 | ...options.headers, | 14 | ...options.headers, |
15 | }, | 15 | }, |
16 | }); | 16 | }); |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 87a4ada27..9db434099 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import { app, systemPreferences } from '@electron/remote'; | 1 | import { systemPreferences } from '@electron/remote'; |
2 | import React, { Component } from 'react'; | 2 | import React, { Component } from 'react'; |
3 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
@@ -16,7 +16,7 @@ import { | |||
16 | FRANZ_TRANSLATION, | 16 | FRANZ_TRANSLATION, |
17 | GITHUB_FRANZ_URL, | 17 | GITHUB_FRANZ_URL, |
18 | } from '../../../config'; | 18 | } from '../../../config'; |
19 | import { DEFAULT_APP_SETTINGS, isMac, isWindows, lockFerdiShortcutKey } from '../../../environment'; | 19 | import { DEFAULT_APP_SETTINGS, ferdiVersion, isMac, isWindows, lockFerdiShortcutKey } from '../../../environment'; |
20 | import globalMessages from '../../../i18n/globalMessages'; | 20 | import globalMessages from '../../../i18n/globalMessages'; |
21 | 21 | ||
22 | const messages = defineMessages({ | 22 | const messages = defineMessages({ |
@@ -669,7 +669,7 @@ export default @observer class EditSettingsForm extends Component { | |||
669 | )} | 669 | )} |
670 | {intl.formatMessage(messages.currentVersion)} | 670 | {intl.formatMessage(messages.currentVersion)} |
671 | {' '} | 671 | {' '} |
672 | {app.getVersion()} | 672 | {ferdiVersion} |
673 | {noUpdateAvailable && ( | 673 | {noUpdateAvailable && ( |
674 | <> | 674 | <> |
675 | <br /> | 675 | <br /> |
diff --git a/src/environment.js b/src/environment.js index 42c6b2927..f2a889be4 100644 --- a/src/environment.js +++ b/src/environment.js | |||
@@ -31,6 +31,7 @@ export const ferdiVersion = app.getVersion(); | |||
31 | export const electronVersion = process.versions.electron; | 31 | export const electronVersion = process.versions.electron; |
32 | export const chromeVersion = process.versions.chrome; | 32 | export const chromeVersion = process.versions.chrome; |
33 | export const nodeVersion = process.versions.node; | 33 | export const nodeVersion = process.versions.node; |
34 | export const ferdiLocale = app.getLocale(); | ||
34 | 35 | ||
35 | // Set app directory before loading user modules | 36 | // Set app directory before loading user modules |
36 | if (process.env.FERDI_APPDATA_DIR != null) { | 37 | if (process.env.FERDI_APPDATA_DIR != null) { |
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js index a7fe24bb1..962f3e694 100644 --- a/src/features/announcements/api.js +++ b/src/features/announcements/api.js | |||
@@ -1,14 +1,14 @@ | |||
1 | import { app } from '@electron/remote'; | ||
2 | import Request from '../../stores/lib/Request'; | 1 | import Request from '../../stores/lib/Request'; |
3 | import apiBase from '../../api/apiBase'; | 2 | import apiBase from '../../api/apiBase'; |
4 | import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config'; | 3 | import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config'; |
4 | import { ferdiVersion } from '../../environment'; | ||
5 | 5 | ||
6 | const debug = require('debug')('Ferdi:feature:announcements:api'); | 6 | const debug = require('debug')('Ferdi:feature:announcements:api'); |
7 | 7 | ||
8 | export const announcementsApi = { | 8 | export const announcementsApi = { |
9 | async getCurrentVersion() { | 9 | async getCurrentVersion() { |
10 | debug('getting current version of electron app'); | 10 | debug('getting current version of electron app'); |
11 | return Promise.resolve(app.getVersion()); | 11 | return Promise.resolve(ferdiVersion); |
12 | }, | 12 | }, |
13 | 13 | ||
14 | async getChangelog(version) { | 14 | async getChangelog(version) { |
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 1d706f1ef..180f01af6 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -24,6 +24,7 @@ import { | |||
24 | electronVersion, | 24 | electronVersion, |
25 | osRelease, | 25 | osRelease, |
26 | userDataPath, | 26 | userDataPath, |
27 | ferdiLocale, | ||
27 | } from '../environment'; | 28 | } from '../environment'; |
28 | import locales from '../i18n/translations'; | 29 | import locales from '../i18n/translations'; |
29 | import { onVisibilityChange } from '../helpers/visibility-helper'; | 30 | import { onVisibilityChange } from '../helpers/visibility-helper'; |
@@ -509,7 +510,7 @@ export default class AppStore extends Store { | |||
509 | 510 | ||
510 | _getDefaultLocale() { | 511 | _getDefaultLocale() { |
511 | return getLocale({ | 512 | return getLocale({ |
512 | locale: app.getLocale(), | 513 | locale: ferdiLocale, |
513 | locales, | 514 | locales, |
514 | defaultLocale, | 515 | defaultLocale, |
515 | fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale, | 516 | fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale, |
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 4ccb995ae..2ec6a0a68 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -2,7 +2,6 @@ import { shell } from 'electron'; | |||
2 | import { action, reaction, computed, observable } from 'mobx'; | 2 | import { action, reaction, computed, observable } from 'mobx'; |
3 | import { debounce, remove } from 'lodash'; | 3 | import { debounce, remove } from 'lodash'; |
4 | import ms from 'ms'; | 4 | import ms from 'ms'; |
5 | import { app } from '@electron/remote'; | ||
6 | import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra'; | 5 | import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra'; |
7 | import { join } from 'path'; | 6 | import { join } from 'path'; |
8 | 7 | ||
@@ -18,6 +17,7 @@ import { | |||
18 | import { workspaceStore } from '../features/workspaces'; | 17 | import { workspaceStore } from '../features/workspaces'; |
19 | import { KEEP_WS_LOADED_USID } from '../config'; | 18 | import { KEEP_WS_LOADED_USID } from '../config'; |
20 | import { SPELLCHECKER_LOCALES } from '../i18n/languages'; | 19 | import { SPELLCHECKER_LOCALES } from '../i18n/languages'; |
20 | import { ferdiVersion } from '../environment'; | ||
21 | 21 | ||
22 | const debug = require('debug')('Ferdi:ServiceStore'); | 22 | const debug = require('debug')('Ferdi:ServiceStore'); |
23 | 23 | ||
@@ -1149,7 +1149,7 @@ export default class ServicesStore extends Store { | |||
1149 | 'initialize-recipe', | 1149 | 'initialize-recipe', |
1150 | { | 1150 | { |
1151 | ...shareWithWebview, | 1151 | ...shareWithWebview, |
1152 | franzVersion: app.getVersion(), | 1152 | franzVersion: ferdiVersion, |
1153 | }, | 1153 | }, |
1154 | service.recipe, | 1154 | service.recipe, |
1155 | ); | 1155 | ); |