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

x Fixed an issue with openURLExternally() that caused some links to be passed to custom browser incorrectly

This commit is contained in:
Greyhoof 2023-09-16 20:42:12 +02:00
parent d038654538
commit 77fcaaf095
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
electron/main.ts
View File

@ -178,10 +178,15 @@ function openURLExternally(linkUrl: string): void {
fs.existsSync(settings.browserPath) && fs.existsSync(settings.browserPath) &&
fs.lstatSync(settings.browserPath).isFile()) { fs.lstatSync(settings.browserPath).isFile()) {
// encode URL so if it contains spaces, it remains a single argument for the browser // encode URL so if it contains spaces, it remains a single argument for the browser
linkUrl= encodeURI(linkUrl); linkUrl = encodeURI(linkUrl);
// replace %s in arguments with URL, otherwise add the URL at the end if(!settings.browserArgs.includes('%s')) {
let link = settings.browserArgs.includes('%s') ? settings.browserArgs.replace('%s', linkUrl) : `${settings.browserArgs} ${linkUrl}`; // 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; const execFile = require('child_process').exec;
execFile(`"${settings.browserPath}" ${link}`); execFile(`"${settings.browserPath}" ${link}`);