Compare commits

..

No commits in common. "fdfedab77f115ca1c7032b3cecc42c46ae282b0f" and "361db1df17d3832e82d1a7284ce7a1b849123e74" have entirely different histories.

5 changed files with 8 additions and 41 deletions

7
app.js
View File

@ -313,7 +313,7 @@ async function tryLogin(window) {
window.webContents.send('account_update', { window.webContents.send('account_update', {
type: "loggedin", type: "loggedin",
user: loginResponse.user user: loginResponse.user
}); })
} else { } else {
await config.remove("username"); await config.remove("username");
await config.remove("password"); await config.remove("password");
@ -327,11 +327,6 @@ async function tryLogin(window) {
type: "not-loggedin" type: "not-loggedin"
}) })
} }
const checkUpdate = await appInfo.hasUpdate();
if(checkUpdate){
window.webContents.send('launcher_update', checkUpdate);
}
} }
async function doUpdateCheck(window) { async function doUpdateCheck(window) {

View File

@ -1,20 +1,4 @@
const { default: axios } = require("axios");
const { compareVersions } = require("compare-versions");
const appName = "EZPPLauncher" const appName = "EZPPLauncher"
const appVersion = "1.1.4"; const appVersion = "1.1.3";
const hasUpdate = async () => { module.exports = { appName, appVersion };
const releaseInfo = await axios.get(`https://git.ez-pp.farm/api/v1/repos/EZPPFarm/${appName}/releases/latest`);
if (releaseInfo.status !== 200) return false;
const latestReleaseVersion = releaseInfo.data.tag_name;
const updateAvailable = compareVersions(latestReleaseVersion, appVersion);
if(updateAvailable > 0)
return {
version: latestReleaseVersion,
url: releaseInfo.data.html_url,
}
return undefined;
}
module.exports = { appName, appVersion, hasUpdate };

View File

@ -1,5 +1,7 @@
const appInfo = require('./appInfo.js'); const appInfo = require('./appInfo.js');
const DiscordAutoRPC = require("discord-auto-rpc"); const DiscordAutoRPC = require("discord-auto-rpc");
const { app } = require('electron');
const DiscordRPC = require("discord-rpc").default;
const clientId = "1032772293220384808"; const clientId = "1032772293220384808";
let client = undefined; let client = undefined;
let lastState = "Idle in Launcher..."; let lastState = "Idle in Launcher...";

View File

@ -1,6 +1,6 @@
{ {
"name": "ezpplauncher", "name": "ezpplauncher",
"version": "1.1.4", "version": "1.1.3",
"main": "app.js", "main": "app.js",
"license": "MIT", "license": "MIT",
"author": "HorizonCode", "author": "HorizonCode",
@ -46,7 +46,6 @@
}, },
"dependencies": { "dependencies": {
"axios": "^0.27.2", "axios": "^0.27.2",
"compare-versions": "^6.0.0-rc.1",
"custom-electron-titlebar": "^4.1.1", "custom-electron-titlebar": "^4.1.1",
"discord-auto-rpc": "^1.0.17", "discord-auto-rpc": "^1.0.17",
"discord-rpc": "^4.0.1", "discord-rpc": "^4.0.1",

View File

@ -1,4 +1,4 @@
const { ipcRenderer, shell } = require('electron'); const { ipcRenderer } = require('electron');
const { Titlebar, Color } = require('custom-electron-titlebar'); const { Titlebar, Color } = require('custom-electron-titlebar');
const appInfo = require('../appInfo'); const appInfo = require('../appInfo');
let titlebar; let titlebar;
@ -150,23 +150,10 @@ window.addEventListener('DOMContentLoaded', () => {
} }
}) })
ipcRenderer.on('launcher_update', async (event, data) => {
const res = await Swal.fire({
title: 'Update available!',
text: `Version ${data.version} has been released!`,
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Download',
cancelButtonText: 'Remind me later',
});
if (res.isConfirmed) {
shell.openExternal(data.url);
}
})
ipcRenderer.on('account_update', (event, data) => { ipcRenderer.on('account_update', (event, data) => {
switch (data.type) { switch (data.type) {
case "login-failed": case "login-failed":
console.log(data);
Swal.fire({ Swal.fire({
title: 'Uh oh!', title: 'Uh oh!',
text: data.message, text: data.message,