From c87714d1c787f6b3f1f3a1c397134e71ece44566 Mon Sep 17 00:00:00 2001 From: Gio Date: Sat, 24 Aug 2024 13:08:22 -0500 Subject: [PATCH] Fix link handling bug unique to the final electron build (resolves #601) --- src/imods/_twoToThree/mod.js | 2 -- src/main.js | 30 ++++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/imods/_twoToThree/mod.js b/src/imods/_twoToThree/mod.js index 9ea1e97..ffe1790 100644 --- a/src/imods/_twoToThree/mod.js +++ b/src/imods/_twoToThree/mod.js @@ -54,8 +54,6 @@ module.exports = { `Lrd English`, `Lrd English`) - console.log(archive.mspa.story['004153'].content) - archive.mspa.story['005530'].content = archive.mspa.story['005530'].content.replace( `Lrd English`, `Lrd English`) diff --git a/src/main.js b/src/main.js index 213ad9c..1f4fff5 100644 --- a/src/main.js +++ b/src/main.js @@ -39,8 +39,8 @@ if (!window.isWebApp) { const Store = require('electron-store') store = new Store() - log = require('electron-log'); - log.transports.console.format = '[{level}] {text}'; + log = require('electron-log') + log.transports.console.format = '[{level}] {text}' var {port, appVersion} = ipcRenderer.sendSync('STARTUP_GET_INFO') @@ -56,6 +56,9 @@ Number.prototype.pad = function(size) { return this.toString().padStart(size || 2, '0') } +function regExpEscape(literal_string) { + return literal_string.replace(/[-[\]{}()*+!<=:?.\/\\^$|#\s,]/g, '\\$&') +} const app_domain = window.location.host // (window.isWebApp ? window.webAppDomain : 'localhost:8080') @@ -74,19 +77,19 @@ Vue.use(localData) // Initializes and loads when Vue installs it promises_loading.push((async function() { const { FontAwesomeIcon } = await importFontAwesomeIconObj Vue.component('fa-icon', FontAwesomeIcon) -})()); +})()) // Mixin asynccomputed promises_loading.push((async function() { const AsyncComputed = await importAsyncComputed Vue.use(AsyncComputed) -})()); +})()) // Mixin mod mixins promises_loading.push((async function() { const mixins = await Mods.getMixinsAsync() mixins.forEach((m) => Vue.mixin(m)) -})()); +})()) Vue.mixin(Memoization.mixin) @@ -123,7 +126,7 @@ Vue.mixin({ if (vizNums) resolvedUrl = `/${vizNums.s}/${vizNums.p}` } else if (this.$localData.settings.mspaMode) { if (base == 'mspa') { - let p_padded = route.params.p.padStart(6, '0') + const p_padded = route.params.p.padStart(6, '0') if (p_padded in this.$archive.mspa.story) resolvedUrl = `/mspa/${p_padded}` } else if (this.$isVizBase(base)) { // Route /homestuck/# to /mspa/# @@ -139,8 +142,8 @@ Vue.mixin({ $openLink(url, auxClick = false) { // Open a link. Could be intra-app, external, or an assets:// uri // - const re_local = new RegExp(`(${app_domain}|app:\/\/\\.(index)?)`) - const re_local_index = new RegExp(`(${app_domain}|app:\/\/\\.\/)index\\.html\\??`) + const re_local = new RegExp(`^(${regExpEscape(app_domain)}|app:\/\/\\.(index)?)`) + const re_local_index = new RegExp(`^(${regExpEscape(app_domain)}|app:\/\/\\.\/)index\\.html\\??`) // const re_local_asset = new RegExp(`(http:\/\/127.0.0.1:${port}\/|assets:\/\/)`) // Normalize implied proto://./index.html links back to proto://./ @@ -151,7 +154,7 @@ Vue.mixin({ if (!window.isWebApp) { shell.openExternal(to_) } else { - window.open(Resources.resolveURL(to_), '_blank').focus(); + window.open(Resources.resolveURL(to_), '_blank').focus() } } @@ -190,7 +193,7 @@ Vue.mixin({ }, $getResourceURL(url) { const resource_url = Resources.getResourceURL(url) - if (isWebApp) { + if (window.isWebApp) { // simulate webRequest redirection here return Resources.resolveURL(url) } else { @@ -286,7 +289,7 @@ Vue.mixin({ else if ('006369' <= thisPageId && thisPageId <= '006468') nextLimit = '006469' // Roxy+Dirk // A6A5A1x2 COMBO - else if ('007688' <= thisPageId && thisPageId <='007825') { + else if ('007688' <= thisPageId && thisPageId <= '007825') { // Sets the next page an extra step ahead to account for the x2 shittery const isLeftPage = !(thisPageId % 2) const page = this.$archive.mspa.story[thisPageId] @@ -438,7 +441,7 @@ Vue.mixin({ else if (ref == 'one-year-older') date = this.$archive.mspa.story['007162'].timestamp // Just after Caliborn: Enter, before openbound 1 else if (ref == 'cherubim') date = this.$archive.mspa.story['007882'].timestamp // After Interfishin, right when Caliborn/Calliope expodump begins - else date = new Date(this.$archive.music.albums[ref].date).getTime()/1000 + else date = new Date(this.$archive.music.albums[ref].date).getTime() / 1000 this.$logger.debug(ref, this.$archive.mspa.story['006716'].timestamp) return date > this.$archive.mspa.story[this.$newReaderCurrent].timestamp } else return false @@ -481,7 +484,7 @@ Promise.all(promises_loading).then(_ => { '$localData.settings.devMode'(to, from){ if (log.transports) { const is_dev = to - log.transports.console.level = (is_dev ? "silly" : "info"); + log.transports.console.level = (is_dev ? "silly" : "info") this.$logger.silly("Verbose log message for devs") this.$logger.info("Log message for everybody") } @@ -491,7 +494,6 @@ Promise.all(promises_loading).then(_ => { }).$mount('#app') }) - // Even though we cancel the auxclick, reallly *really* cancel mouse navigation. window.addEventListener("mouseup", (e) => { if (e.button === 3 || e.button === 4){