From d88e1e98ab98ac7acb8cf260b022fdd35b0102cf Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Thu, 18 Jun 2020 16:06:25 -0500 Subject: [PATCH] Disabled autoupdater for now --- electron/chat.ts | 2 +- electron/main.ts | 74 ++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/electron/chat.ts b/electron/chat.ts index 0d34286..a2f2493 100644 --- a/electron/chat.ts +++ b/electron/chat.ts @@ -74,7 +74,7 @@ const spellchecker = new sc.Spellchecker();*/ Axios.defaults.params = {__fchat: `desktop/${electron.remote.app.getVersion()}`}; if(process.env.NODE_ENV === 'production') { - setupRaven('https://a9239b17b0a14f72ba85e8729b9d1612@sentry.f-list.net/2', electron.remote.app.getVersion()); + // setupRaven('https://a9239b17b0a14f72ba85e8729b9d1612@sentry.f-list.net/2', electron.remote.app.getVersion()); electron.remote.getCurrentWebContents().on('devtools-opened', () => { console.log(`%c${l('consoleWarning.head')}`, 'background: red; color: yellow; font-size: 30pt'); diff --git a/electron/main.ts b/electron/main.ts index b48ee2f..f2ddf6a 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -306,41 +306,41 @@ function onReady(): void { setGeneralSettings(settings); } - const updaterUrl = `https://client.f-list.net/${process.platform}`; - 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 updaterUrl = `https://client.f-list.net/${process.platform}`; + // 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 = { label: `&${l('action.view')}`, @@ -429,8 +429,8 @@ function onReady(): void { click: async(item: Electron.MenuItem) => { settings.beta = item.checked; setGeneralSettings(settings); - electron.autoUpdater.setFeedURL({url: updaterUrl + (item.checked ? '?channel=beta' : ''), serverType: 'json'}); - return electron.autoUpdater.checkForUpdates(); + // electron.autoUpdater.setFeedURL({url: updaterUrl + (item.checked ? '?channel=beta' : ''), serverType: 'json'}); + // return electron.autoUpdater.checkForUpdates(); } }, { label: l('fixLogs.action'),