diff --git a/index.js b/index.js index 8558e24b..f00660a1 100644 --- a/index.js +++ b/index.js @@ -317,17 +317,6 @@ app.once("browser-window-created", (event, win) => { win.webContents.on("will-prevent-unload", (event) => { event.preventDefault(); }); - - win.webContents.on( - "new-window", - (e, url, frameName, disposition, options) => { - // hook on new opened window - - // at now new window in mainWindow renderer process. - // Also, this will automatically get an option `nodeIntegration=false`(not override to true, like in iframe's) - like in regular browsers - options.webPreferences.affinity = "main-window"; - } - ); }); app.on("window-all-closed", () => { diff --git a/menu.js b/menu.js index 630b48d4..068393f6 100644 --- a/menu.js +++ b/menu.js @@ -1,7 +1,7 @@ const { existsSync } = require("fs"); const path = require("path"); -const { app, Menu, dialog } = require("electron"); +const { app, clipboard, Menu, dialog } = require("electron"); const is = require("electron-is"); const { restart } = require("./providers/app-controls"); @@ -329,6 +329,13 @@ const mainMenuTemplate = (win) => { } }, }, + { + label: "Copy current URL", + click: () => { + const currentURL = win.webContents.getURL(); + clipboard.writeText(currentURL); + }, + }, { label: "Restart App", click: restart diff --git a/package.json b/package.json index e94c18bc..68007a9a 100644 --- a/package.json +++ b/package.json @@ -82,8 +82,9 @@ "build:win": "yarn run clean && electron-builder --win", "lint": "xo", "changelog": "auto-changelog", - "plugins": "yarn run plugin:adblocker", + "plugins": "yarn run plugin:adblocker && yarn run plugin:bypass-age-restrictions", "plugin:adblocker": "del-cli -f \"plugins/adblocker/ad-blocker-engine.bin\" && node plugins/adblocker/blocker.js", + "plugin:bypass-age-restrictions": "yarn run generate:package Simple-YouTube-Age-Restriction-Bypass", "release:linux": "yarn run clean && electron-builder --linux -p always -c.snap.publish=github", "release:mac": "yarn run clean && electron-builder --mac -p always", "release:win": "yarn run clean && electron-builder --win -p always" diff --git a/plugins/bypass-age-restrictions/front.js b/plugins/bypass-age-restrictions/front.js index 381fa656..a74f4413 100644 --- a/plugins/bypass-age-restrictions/front.js +++ b/plugins/bypass-age-restrictions/front.js @@ -1,4 +1,4 @@ module.exports = () => { // See https://github.com/zerodytrash/Simple-YouTube-Age-Restriction-Bypass#userscript - require("simple-youtube-age-restriction-bypass/Simple-YouTube-Age-Restriction-Bypass.user.js"); + require("Simple-YouTube-Age-Restriction-Bypass/Simple-YouTube-Age-Restriction-Bypass.user.js"); }; diff --git a/utils/generate-package-json.js b/utils/generate-package-json.js index 56566528..bcda791f 100755 --- a/utils/generate-package-json.js +++ b/utils/generate-package-json.js @@ -10,7 +10,15 @@ const { promisify } = require("util"); */ const generatePackageJson = async packageName => { - var filepath = join("node_modules", packageName, "package.json"); + const packageFolder = join("node_modules", packageName) + if (!existsSync(packageFolder )) { + console.log( + `${packageName} module not found, exiting…` + ); + return + } + + const filepath = join(packageFolder, "package.json"); if (!existsSync(filepath)) { console.log( `No package.json found for ${packageName} module, generating one…`