From ac7a137f4e2c7901a6410b5a6063c489a0aadd24 Mon Sep 17 00:00:00 2001
From: Keith Maika <keithm@aoeex.com>
Date: Fri, 7 Jan 2022 13:53:19 -0500
Subject: [PATCH] Get electron and application versions dynamically.

---
 app/init.js               | 4 ++--
 app/views/about/page.html | 2 +-
 main.js                   | 8 ++++++++
 preload.js                | 8 ++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/init.js b/app/init.js
index d7e23c4..f825bf6 100644
--- a/app/init.js
+++ b/app/init.js
@@ -1,11 +1,11 @@
 const angApp = angular.module('app', [])
 angApp.constant('AppInfo', {
     APP_NAME: 'Converse Desktop',
-    APP_VERSION: 'v0.1.0',
+    APP_VERSION: await api.getApplicationVersion(),
     APP_HOME: 'https://github.com/conversejs/converse-desktop',
     APP_RELEASES_CHECK_URL: 'https://api.github.com/repos/conversejs/converse-desktop/releases',
     APP_RELEASES_URL: 'https://github.com/conversejs/converse-desktop/releases',
-    ELECTRON_VERSION: '13.6.6'
+    ELECTRON_VERSION: await api.getElectronVersion()
 });
 
 export default angApp;
diff --git a/app/views/about/page.html b/app/views/about/page.html
index 470998b..68f8ebe 100644
--- a/app/views/about/page.html
+++ b/app/views/about/page.html
@@ -6,7 +6,7 @@
                     class="chimeverse-branding__img" />
             </div>
             <div class="about-card__description">
-                <h3 class="about__title">About {{appInfo.APP_NAME}} {{appInfo.APP_VERSION}}</h3>
+                <h3 class="about__title">About {{appInfo.APP_NAME}} v{{appInfo.APP_VERSION}}</h3>
                 <div class="about__description">Jabber/XMPP client based on Converse.js and Electron</div>
                 <div>&nbsp;</div>
                 <div class="about__converse-version">
diff --git a/main.js b/main.js
index f42f0ca..5d162ed 100644
--- a/main.js
+++ b/main.js
@@ -141,6 +141,14 @@ function createWindow() {
         return mainWindow.reload();
     })
 
+    ipcMain.handle('getApplicationVersion', () => {
+        return app.getVersion();
+    });
+
+    ipcMain.handle('getElectronVersion', () => {
+        return process.versions.electron;
+    });
+
     // Emitted when the window is closed.
     mainWindow.on('closed', function () {
         // Dereference the window object, usually you would store windows
diff --git a/preload.js b/preload.js
index f1745d3..d62939a 100644
--- a/preload.js
+++ b/preload.js
@@ -15,6 +15,14 @@ contextBridge.exposeInMainWorld('api', {
         ipcRenderer.send('reload')
     },
 
+    getApplicationVersion() {
+        return ipcRenderer.invoke('getApplicationVersion');
+    },
+
+    getElectronVersion() {
+        return ipcRenderer.invoke('getElectronVersion');
+    },
+
     electronSettings: {
         hasSync(setting) {
             return ipcRenderer.sendSync('electron-settings', 'hasSync', setting)