diff --git a/chat/localize.ts b/chat/localize.ts index 36e998e..ea8fb63 100644 --- a/chat/localize.ts +++ b/chat/localize.ts @@ -189,6 +189,15 @@ Current log location: {1}`, 'settings.beta': 'Opt-in to test unstable prerelease updates', 'settings.hwAcceleration': 'Enable hardware acceleration (requires restart)', 'settings.bbCodeBar': 'Show BBCode formatting bar', + 'settings.browserOption': 'Set command for opening clicked links', + 'settings.browserOptionHeader': 'Browser Settings', + 'settings.browserOptionTitle': 'Browser Path', + 'settings.browserOptionPath': 'Path to browser executable', + 'settings.browserOptionArguments': 'Arguments to pass to executable', + 'settings.browserOptionArgumentsHelp': 'Arguments are separated by spaces. Use %s to insert the URL.', + 'settings.browserOptionBrowse': 'Browse', + 'settings.browserOptionSave': 'Save', + 'settings.browserOptionReset': 'Reset to default', 'fixLogs.action': 'Fix corrupted logs', 'fixLogs.text': `There are a few reason log files can become corrupted - log files from old versions with bugs that have since been fixed or incomplete file operations caused by computer crashes are the most common. If one of your log files is corrupted, you may get an "Unknown Type" error when you log in or when you open a specific tab. You may also experience other issues. diff --git a/electron/BrowserOption.vue b/electron/BrowserOption.vue new file mode 100644 index 0000000..5913c2b --- /dev/null +++ b/electron/BrowserOption.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/electron/Index.vue b/electron/Index.vue index 0f5bbd6..aadb816 100644 --- a/electron/Index.vue +++ b/electron/Index.vue @@ -496,7 +496,8 @@ } async openProfileInBrowser(): Promise { - await remote.shell.openExternal(`https://www.f-list.net/c/${this.profileName}`); + electron.ipcRenderer.send('open-url-externally', `https://www.f-list.net/c/${this.profileName}`); + //await remote.shell.openExternal(`https://www.f-list.net/c/${this.profileName}`); // tslint:disable-next-line: no-any no-unsafe-any (this.$refs.profileViewer as any).hide(); @@ -628,7 +629,8 @@ async openWordDefinitionInBrowser(): Promise { - await remote.shell.openExternal((this.$refs.wordDefinitionLookup as any).getWebUrl()); + electron.ipcRenderer.send('open-url-externally', (this.$refs.wordDefinitionLookup as any).getWebUrl()); + //await remote.shell.openExternal((this.$refs.wordDefinitionLookup as any).getWebUrl()); // tslint:disable-next-line: no-any no-unsafe-any (this.$refs.wordDefinitionViewer as any).hide(); diff --git a/electron/browser_option.html b/electron/browser_option.html new file mode 100644 index 0000000..954e08b --- /dev/null +++ b/electron/browser_option.html @@ -0,0 +1,14 @@ + + + + + + F-Chat + + + +
+ + + + diff --git a/electron/browser_option.ts b/electron/browser_option.ts new file mode 100644 index 0000000..e8e5f80 --- /dev/null +++ b/electron/browser_option.ts @@ -0,0 +1,25 @@ +import * as qs from 'querystring'; +import log from 'electron-log'; //tslint:disable-line:match-default-export-name + +import {GeneralSettings} from './common'; +import BrowserOption from './BrowserOption.vue'; + +log.info('init.browser_option'); + +const params = <{[key: string]: string | undefined}>qs.parse(window.location.search.substr(1)); +const settings = JSON.parse(params['settings']!); + +const logLevel = (process.env.NODE_ENV === 'production') ? 'info' : 'silly'; + +log.transports.file.level = settings.risingSystemLogLevel || logLevel; +log.transports.console.level = settings.risingSystemLogLevel || logLevel; +log.transports.file.maxSize = 5 * 1024 * 1024; + +log.info('init.browser_option.vue'); + +new BrowserOption({ + el: '#browserOption', + data: {settings} +}); + +log.debug('init.browser_option.vue.done'); diff --git a/electron/common.ts b/electron/common.ts index 0425a81..9906507 100644 --- a/electron/common.ts +++ b/electron/common.ts @@ -31,6 +31,8 @@ export class GeneralSettings { risingCacheExpiryDays = 30; risingSystemLogLevel: log.LevelOption = 'info'; risingDisableWindowsHighContrast = false; + browserPath = ''; + browserArgs = '%s'; } // //tslint:disable diff --git a/electron/main.ts b/electron/main.ts index ee53899..0377a0e 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -53,6 +53,7 @@ import DownloadItem = electron.DownloadItem; import { AdCoordinatorHost } from '../chat/ads/ad-coordinator-host'; import { IpcMainEvent } from 'electron'; import { BlockerIntegration } from './blocker/blocker'; +import core from "../chat/core"; //tslint:disable-next-line:no-require-imports const pck = require('./package.json'); @@ -171,14 +172,70 @@ async function addSpellcheckerItems(menu: electron.Menu): Promise { })); } +function openURLExternally(linkUrl: string): void { + + // check if user set a path and whether it exists + const pathIsValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath)); + + if(pathIsValid) { + // also check if the user can execute whatever is located at the selected path + let fileIsExecutable = false; + try { + fs.accessSync(settings.browserPath, fs.constants.X_OK); + fileIsExecutable = true; + } catch (err) { + log.error(`Selected browser is not executable by user. Path: "${settings.browserPath}"`); + } + + if (fileIsExecutable) { + // check if URL is already encoded + // (this should work almost all the time, but there might be edge-cases with very unusual URLs) + let isEncoded = (linkUrl !== decodeURI(linkUrl)); + // only encode URL if it isn't encoded yet + if (!isEncoded) { + // encode URL so if it contains spaces, it remains a single argument for the browser + linkUrl = encodeURI(linkUrl); + } + + if (!settings.browserArgs.includes('%s')) { + // append %s to params if it is not already there + settings.browserArgs += ' %s'; + } + + // replace %s in arguments with URL and encapsulate in quotes to prevent issues with spaces and special characters in the path + let link = settings.browserArgs.replace('%s', '\"' + linkUrl + '\"'); + + const execFile = require('child_process').exec; + if (process.platform === "darwin") { + // NOTE: This is seemingly bugged on MacOS when setting Safari as the external browser while using a different default browser. + // In that case, this will open the URL in both the selected application AND the default browser. + // Other browsers work fine. (Tested with Chrome with Firefox as the default browser.) + // https://developer.apple.com/forums/thread/685385 + execFile(`open -a "${settings.browserPath}" ${link}`); + } else { + execFile(`"${settings.browserPath}" ${link}`); + } + return; + } + } + + electron.shell.openExternal(linkUrl); +} + function setUpWebContents(webContents: electron.WebContents): void { remoteMain.enable(webContents); const openLinkExternally = (e: Event, linkUrl: string) => { e.preventDefault(); const profileMatch = linkUrl.match(/^https?:\/\/(www\.)?f-list.net\/c\/([^/#]+)\/?#?/); - if(profileMatch !== null && settings.profileViewer) webContents.send('open-profile', decodeURIComponent(profileMatch[2])); - else return electron.shell.openExternal(linkUrl); + if(profileMatch !== null && settings.profileViewer) { + webContents.send('open-profile', decodeURIComponent(profileMatch[2])); + return; + } + + // otherwise, try to open externally + openURLExternally(linkUrl); + }; webContents.setVisualZoomLevelLimits(1, 5); @@ -281,7 +338,44 @@ function createWindow(): electron.BrowserWindow | undefined { function showPatchNotes(): void { //tslint:disable-next-line: no-floating-promises - electron.shell.openExternal('https://github.com/hearmeneigh/fchat-rising/blob/master/CHANGELOG.md'); + openURLExternally('https://github.com/hearmeneigh/fchat-rising/blob/master/CHANGELOG.md'); +} + +function openBrowserSettings(): electron.BrowserWindow | undefined { + let desiredHeight = 520; + if(process.platform === 'darwin') { + desiredHeight = 750; + } + + const windowProperties: electron.BrowserWindowConstructorOptions = { + center: true, + show: false, + icon: process.platform === 'win32' ? winIcon : pngIcon, + frame: false, + width: 650, + height: desiredHeight, + minWidth: 650, + minHeight: desiredHeight, + maxWidth: 650, + maxHeight: desiredHeight, + maximizable: false, + webPreferences: { + webviewTag: true, nodeIntegration: true, nodeIntegrationInWorker: true, spellcheck: true, + enableRemoteModule: true, contextIsolation: false, partition: 'persist:fchat' + } as any + }; + + const browserWindow = new electron.BrowserWindow(windowProperties); + remoteMain.enable(browserWindow.webContents); + browserWindow.loadFile(path.join(__dirname, 'browser_option.html'), { + query: { settings: JSON.stringify(settings), import: shouldImportSettings ? 'true' : '' } + }); + + browserWindow.once('ready-to-show', () => { + browserWindow.show(); + }); + + return browserWindow; } @@ -529,6 +623,12 @@ function onReady(): void { settings.risingDisableWindowsHighContrast = item.checked; setGeneralSettings(settings); } + }, + { + label: l('settings.browserOption'), + click: () => { + openBrowserSettings(); + } } ] }, @@ -576,23 +676,23 @@ function onReady(): void { submenu: [ { label: l('help.fchat'), - click: () => electron.shell.openExternal('https://github.com/hearmeneigh/fchat-rising/blob/master/README.md') + click: () => openURLExternally('https://github.com/hearmeneigh/fchat-rising/blob/master/README.md') }, // { // label: l('help.feedback'), - // click: () => electron.shell.openExternal('https://goo.gl/forms/WnLt3Qm3TPt64jQt2') + // click: () => openURLExternally('https://goo.gl/forms/WnLt3Qm3TPt64jQt2') // }, { label: l('help.rules'), - click: () => electron.shell.openExternal('https://wiki.f-list.net/Rules') + click: () => openURLExternally('https://wiki.f-list.net/Rules') }, { label: l('help.faq'), - click: () => electron.shell.openExternal('https://wiki.f-list.net/Frequently_Asked_Questions') + click: () => openURLExternally('https://wiki.f-list.net/Frequently_Asked_Questions') }, { label: l('help.report'), - click: () => electron.shell.openExternal('https://wiki.f-list.net/How_to_Report_a_User#In_chat') + click: () => openURLExternally('https://wiki.f-list.net/How_to_Report_a_User#In_chat') }, {label: l('version', app.getVersion()), click: showPatchNotes} ] @@ -665,6 +765,47 @@ function onReady(): void { for(const w of electron.webContents.getAllWebContents()) w.send('update-zoom', zl); }); + electron.ipcMain.handle('browser-option-browse', async () => { + log.debug('settings.browserOption.browse'); + console.log('settings.browserOption.browse', JSON.stringify(settings)); + + let filters; + if(process.platform === "win32") { + filters = [{ name: 'Executables', extensions: ['exe'] }]; + } else if (process.platform === "darwin") { + filters = [{ name: 'Executables', extensions: ['app'] }]; + } else { + // linux and anything else that might be supported + // no specific extension for executables + filters = [{ name: 'Executables', extensions: ['*'] }]; + } + + const dir = electron.dialog.showOpenDialogSync( + { + defaultPath: settings.browserPath, + properties: ['openFile'], + filters: filters + }); + if(dir !== undefined) { + return dir[0]; + } + + // we keep the current path if the user cancels the dialog + return settings.browserPath; + }); + + electron.ipcMain.on('browser-option-update', (_e, _path: string, _args: string) => { + log.debug('Browser Path settings update:', _path, _args); + // store the new path and args in our general settings + settings.browserPath = _path; + settings.browserArgs = _args; + setGeneralSettings(settings); + }); + + electron.ipcMain.on('open-url-externally', (_e, _url: string) => { + openURLExternally(_url); + }); + createWindow(); } diff --git a/electron/webpack.config.js b/electron/webpack.config.js index f7893e5..924c549 100644 --- a/electron/webpack.config.js +++ b/electron/webpack.config.js @@ -47,7 +47,8 @@ const mainConfig = { }, rendererConfig = { entry: { chat: [path.join(__dirname, 'chat.ts'), path.join(__dirname, 'index.html')], - window: [path.join(__dirname, 'window.ts'), path.join(__dirname, 'window.html'), path.join(__dirname, 'build', 'tray@2x.png')] + window: [path.join(__dirname, 'window.ts'), path.join(__dirname, 'window.html'), path.join(__dirname, 'build', 'tray@2x.png')], + browser_option: [path.join(__dirname, 'browser_option.ts'), path.join(__dirname, 'browser_option.html'), path.join(__dirname, 'build', 'tray@2x.png')] }, output: { path: __dirname + '/app',