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

x Fixed openURLExternally() encoding URLs that were already encoded

This commit is contained in:
Greyhoof 2023-10-10 10:07:29 +02:00
parent 77fcaaf095
commit cdce884844
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electron/main.ts
View File

@ -177,8 +177,16 @@ function openURLExternally(linkUrl: string): void {
if(settings.browserPath !== '' && if(settings.browserPath !== '' &&
fs.existsSync(settings.browserPath) && fs.existsSync(settings.browserPath) &&
fs.lstatSync(settings.browserPath).isFile()) { fs.lstatSync(settings.browserPath).isFile()) {
// 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 // encode URL so if it contains spaces, it remains a single argument for the browser
linkUrl = encodeURI(linkUrl); linkUrl = encodeURI(linkUrl);
}
if(!settings.browserArgs.includes('%s')) { if(!settings.browserArgs.includes('%s')) {
// append %s to params if it is not already there // append %s to params if it is not already there