PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Normalize the local app version (#20062)

Browse source 
We need to strip the leading v from the local app version as well as the one fetched from the server
This commit is contained in:
James Salter 2021-12-07 02:09:23 +11:00 committed by GitHub
parent b14b2967ec
commit 39901b8d72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vector/platform/WebPlatform.ts
View file

@ -128,7 +128,7 @@ export default class WebPlatform extends VectorBasePlatform {
}); });
} }
getAppVersion(): Promise<string> { getNormalizedAppVersion(): string {
let ver = process.env.VERSION; let ver = process.env.VERSION;
// if version looks like semver with leading v, strip it // if version looks like semver with leading v, strip it
@ -137,7 +137,11 @@ export default class WebPlatform extends VectorBasePlatform {
if (semVerRegex.test(process.env.VERSION)) { if (semVerRegex.test(process.env.VERSION)) {
ver = process.env.VERSION.substr(1); ver = process.env.VERSION.substr(1);
} }
return Promise.resolve(ver); return ver;
}
getAppVersion(): Promise<string> {
return Promise.resolve(this.getNormalizedAppVersion());
} }
startUpdater() { startUpdater() {
@ -151,9 +155,11 @@ export default class WebPlatform extends VectorBasePlatform {
pollForUpdate = () => { pollForUpdate = () => {
return this.getMostRecentVersion().then((mostRecentVersion) => { return this.getMostRecentVersion().then((mostRecentVersion) => {
if (process.env.VERSION !== mostRecentVersion) { const currentVersion = this.getNormalizedAppVersion();
if (currentVersion !== mostRecentVersion) {
if (this.shouldShowUpdate(mostRecentVersion)) { if (this.shouldShowUpdate(mostRecentVersion)) {
showUpdateToast(process.env.VERSION, mostRecentVersion); showUpdateToast(currentVersion, mostRecentVersion);
} }
return { status: UpdateCheckStatus.Ready }; return { status: UpdateCheckStatus.Ready };
} else { } else {