kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version management

This commit is contained in:
Mr. Stallion 2020-06-23 18:38:16 -05:00
parent 186e22033f
commit f1cec69efb
4 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/_config.yml
View File

@ -48,11 +48,11 @@ theme: jekyll-theme-slate
download: download:
win_url: https://github.com/mrstallion/fchat-rising/releases/download/v3.0.13-rising-v1/F-Chat.Rising.Setup.exe win_url: https://github.com/mrstallion/fchat-rising/releases/download/v1.0.0/F-Chat-Rising-v1.0.0-win.exe
win_size: 68 MB win_size: 68 MB
mac_url: https://github.com/mrstallion/fchat-rising/releases/download/v3.0.13-rising-v1/F-Chat.Rising.dmg mac_url: https://github.com/mrstallion/fchat-rising/releases/download/v1.0.0/F-Chat-Rising-v1.0.0-macos.dmg
mac_size: 72 MB mac_size: 72 MB
linux_url: https://github.com/mrstallion/fchat-rising/releases/download/v3.0.13-rising-v1/fchat-rising.AppImage linux_url: https://github.com/mrstallion/fchat-rising/releases/download/v1.0.0/F-Chat-Rising-v1.0.0-linux.AppImage
linux_size: 74 MB linux_size: 74 MB

80
electron/main.ts
View File

@ -44,13 +44,15 @@ import {defaultHost, GeneralSettings} from './common';
import { getSafeLanguages, knownLanguageNames, updateSupportedLanguages } from './language'; import { getSafeLanguages, knownLanguageNames, updateSupportedLanguages } from './language';
import * as windowState from './window_state'; import * as windowState from './window_state';
import BrowserWindow = Electron.BrowserWindow; import BrowserWindow = Electron.BrowserWindow;
// import MenuItem = Electron.MenuItem; import MenuItem = Electron.MenuItem;
import { ElectronBlocker } from '@cliqz/adblocker-electron'; import { ElectronBlocker } from '@cliqz/adblocker-electron';
import fetch from 'node-fetch'; import fetch from 'node-fetch';
import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions; import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
import * as _ from 'lodash'; import * as _ from 'lodash';
import DownloadItem = Electron.DownloadItem; import DownloadItem = Electron.DownloadItem;
const pck = require('./package.json');
// Module to control application life. // Module to control application life.
const app = electron.app; const app = electron.app;
@ -306,41 +308,49 @@ function onReady(): void {
setGeneralSettings(settings); setGeneralSettings(settings);
} }
// const updaterUrl = `https://client.f-list.net/${process.platform}`; // require('update-electron-app')(
// if(process.env.NODE_ENV === 'production') { // {
// electron.autoUpdater.setFeedURL({url: updaterUrl + (settings.beta ? '?channel=beta' : ''), serverType: 'json'}); // repo: 'https://github.com/mrstallion/fchat-rising.git',
// setTimeout(() => electron.autoUpdater.checkForUpdates(), 10000); // updateInterval: '3 hours',
// const updateTimer = setInterval(() => electron.autoUpdater.checkForUpdates(), 3600000); // logger: require('electron-log')
// electron.autoUpdater.on('update-downloaded', () => {
// clearInterval(updateTimer);
// const menu = electron.Menu.getApplicationMenu()!;
// const item = menu.getMenuItemById('update') as MenuItem | null;
// if(item !== null) item.visible = true;
// else
// menu.append(new electron.MenuItem({
// label: l('action.updateAvailable'),
// submenu: electron.Menu.buildFromTemplate([{
// label: l('action.update'),
// click: () => {
// for(const w of windows) w.webContents.send('quit');
// electron.autoUpdater.quitAndInstall();
// }
// }, {
// label: l('help.changelog'),
// click: showPatchNotes
// }]),
// id: 'update'
// }));
// electron.Menu.setApplicationMenu(menu);
// for(const w of windows) w.webContents.send('update-available', true);
// });
// electron.autoUpdater.on('update-not-available', () => {
// for(const w of windows) w.webContents.send('update-available', false);
// const item = electron.Menu.getApplicationMenu()!.getMenuItemById('update') as MenuItem | null;
// if(item !== null) item.visible = false;
// });
// electron.autoUpdater.on('error', (e) => log.error(e));
// } // }
// );
const updaterUrl = `https://update.electronjs.org/mrstallion/fchat-rising/${process.platform}-${process.arch}/${pck.version}`;
if(process.env.NODE_ENV === 'production') {
electron.autoUpdater.setFeedURL({url: updaterUrl + (settings.beta ? '?channel=beta' : ''), serverType: 'json'});
setTimeout(() => electron.autoUpdater.checkForUpdates(), 10000);
const updateTimer = setInterval(() => electron.autoUpdater.checkForUpdates(), 3600000);
electron.autoUpdater.on('update-downloaded', () => {
clearInterval(updateTimer);
const menu = electron.Menu.getApplicationMenu()!;
const item = menu.getMenuItemById('update') as MenuItem | null;
if(item !== null) item.visible = true;
else
menu.append(new electron.MenuItem({
label: l('action.updateAvailable'),
submenu: electron.Menu.buildFromTemplate([{
label: l('action.update'),
click: () => {
for(const w of windows) w.webContents.send('quit');
electron.autoUpdater.quitAndInstall();
}
}, {
label: l('help.changelog'),
click: showPatchNotes
}]),
id: 'update'
}));
electron.Menu.setApplicationMenu(menu);
for(const w of windows) w.webContents.send('update-available', true);
});
electron.autoUpdater.on('update-not-available', () => {
for(const w of windows) w.webContents.send('update-available', false);
const item = electron.Menu.getApplicationMenu()!.getMenuItemById('update') as MenuItem | null;
if(item !== null) item.visible = false;
});
electron.autoUpdater.on('error', (e) => log.error(e));
}
const viewItem = { const viewItem = {
label: `&${l('action.view')}`, label: `&${l('action.view')}`,

1
electron/pack.js
View File

@ -78,6 +78,7 @@ require('electron-packager')({
exe: 'F-Chat.exe', exe: 'F-Chat.exe',
title: 'F-Chat Rising', title: 'F-Chat Rising',
setupExe: setupName, setupExe: setupName,
name: 'fchat'
// remoteReleases: 'https://client.f-list.net/win32/' + (isBeta ? '?channel=beta' : ''), // remoteReleases: 'https://client.f-list.net/win32/' + (isBeta ? '?channel=beta' : ''),
// signWithParams: process.argv.length > 3 ? `/a /f ${process.argv[2]} /p ${process.argv[3]} /fd sha256 /tr http://timestamp.digicert.com /td sha256` : undefined // signWithParams: process.argv.length > 3 ? `/a /f ${process.argv[2]} /p ${process.argv[3]} /fd sha256 /tr http://timestamp.digicert.com /td sha256` : undefined
}).catch((e) => console.error(`Error while creating installer: ${e.message}`)); }).catch((e) => console.error(`Error while creating installer: ${e.message}`));

2
electron/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fchat", "name": "fchat",
"version": "3.0.13-rising-v1", "version": "1.0.0",
"author": "The F-List Team and Mister Stallion (Esq.)", "author": "The F-List Team and Mister Stallion (Esq.)",
"description": "F-List.net Chat Client", "description": "F-List.net Chat Client",
"main": "main.js", "main": "main.js",