Merge branch 'local-upstream/master' into option-to-load-captions-selector-on-every-song

Author: Araxeus

.github/workflows/build.yml

@@ -1,7 +1,9 @@
 name: Build YouTube Music
 
 on:
-  - push
+  push:
+    branches: [ master ]
+  pull_request:
 
 env:
   NODE_VERSION: "16.x"

config/dynamic.js

@@ -3,6 +3,30 @@ const { ipcRenderer, ipcMain } = require("electron");
 const defaultConfig = require("./defaults");
 const { getOptions, setOptions, setMenuOptions } = require("./plugins");
 
+const activePlugins = {};
+/**
+ * [!IMPORTANT!]
+ * The method is **sync** in the main process and **async** in the renderer process.
+ */
+module.exports.getActivePlugins =
+	process.type === "renderer"
+		? async () => ipcRenderer.invoke("get-active-plugins")
+		: () => activePlugins;
+
+if (process.type === "browser") {
+	ipcMain.handle("get-active-plugins", this.getActivePlugins);
+}
+
+/**
+ * [!IMPORTANT!]
+ * The method is **sync** in the main process and **async** in the renderer process.
+ */
+module.exports.isActive =
+	process.type === "renderer"
+		? async (plugin) =>
+				plugin in (await ipcRenderer.invoke("get-active-plugins"))
+		: (plugin) => plugin in activePlugins;
+
 /**
  * This class is used to create a dynamic synced config for plugins.
  *
@@ -17,9 +41,9 @@ const { getOptions, setOptions, setMenuOptions } = require("./plugins");
  * const { PluginConfig } = require("../../config/dynamic");
  * const config = new PluginConfig("plugin-name", { enableFront: true });
  * module.exports = { ...config };
- * 
+ *
  * // or
- * 
+ *
  * module.exports = (win, options) => {
  *  const config = new PluginConfig("plugin-name", {
  *  	enableFront: true,
@@ -46,6 +70,8 @@ module.exports.PluginConfig = class PluginConfig {
 		if (this.#enableFront) {
 			this.#setupFront();
 		}
+
+		activePlugins[name] = this;
 	}
 
 	get = (option) => {
@@ -85,6 +111,7 @@ module.exports.PluginConfig = class PluginConfig {
 		setMenuOptions(this.#name, this.#config);
 	};
 
+	/** Called only from back */
 	#save() {
 		setOptions(this.#name, this.#config);
 	}

config/store.js

@@ -19,6 +19,11 @@ const migrations = {
 				...pluginOptions,
 			});
 		}
+
+		if (store.get("options.ForceShowLikeButtons")) {
+			store.delete("options.ForceShowLikeButtons");
+			store.set("options.likeButtons", 'force');
+		}
 	},
 	">=1.17.0": (store) => {
 		setDefaultPluginOptions(store, "picture-in-picture");

index.js

@@ -34,11 +34,6 @@ autoUpdater.autoDownload = false;
 const gotTheLock = app.requestSingleInstanceLock();
 if (!gotTheLock) app.exit();
 
-app.commandLine.appendSwitch(
-	"js-flags",
-	// WebAssembly flags
-	"--experimental-wasm-threads"
-);
 app.commandLine.appendSwitch("enable-features", "SharedArrayBuffer"); // Required for downloader
 app.allowRendererProcessReuse = true; // https://github.com/electron/electron/issues/18397
 if (config.get("options.disableHardwareAcceleration")) {

menu.js

@@ -93,12 +93,33 @@ const mainMenuTemplate = (win) => {
 							},
 						},
 						{
-							label: "Force show like buttons",
-							type: "checkbox",
-							checked: config.get("options.ForceShowLikeButtons"),
-							click: (item) => {
-								config.set("options.ForceShowLikeButtons", item.checked);
-							},
+							label: "Like buttons",
+							submenu: [
+								{
+									label: "Default",
+									type: "radio",
+									checked: !config.get("options.likeButtons"),
+									click: () => {
+										config.set("options.likeButtons", '');
+									},
+								},
+								{
+									label: "Force show",
+									type: "radio",
+									checked: config.get("options.likeButtons") === 'force',
+									click: () => {
+										config.set("options.likeButtons", 'force');
+									}
+								},
+								{
+									label: "Hide",
+									type: "radio",
+									checked: config.get("options.likeButtons") === 'hide',
+									click: () => {
+										config.set("options.likeButtons", 'hide');
+									}
+								},
+							],
 						},
 						{
 							label: "Theme",
@@ -131,7 +152,7 @@ const mainMenuTemplate = (win) => {
 					],
 				},
 				{
-					label: "Release single instance lock",
+					label: "Single instance lock",
 					type: "checkbox",
 					checked: false,
 					click: (item) => {

package.json

@@ -87,11 +87,11 @@
 		"generate:package": "node utils/generate-package-json.js",
 		"postinstall": "yarn run icon && yarn run plugins",
 		"clean": "del-cli dist",
-		"build": "yarn run clean && electron-builder --win --mac --linux",
-		"build:linux": "yarn run clean && electron-builder --linux",
-		"build:mac": "yarn run clean && electron-builder --mac dmg:x64",
-		"build:mac:arm64": "yarn run clean && electron-builder --mac dmg:arm64",
-		"build:win": "yarn run clean && electron-builder --win",
+		"build": "yarn run clean && electron-builder --win --mac --linux -p never",
+		"build:linux": "yarn run clean && electron-builder --linux -p never",
+		"build:mac": "yarn run clean && electron-builder --mac dmg:x64 -p never",
+		"build:mac:arm64": "yarn run clean && electron-builder --mac dmg:arm64 -p never",
+		"build:win": "yarn run clean && electron-builder --win -p never",
 		"lint": "xo",
 		"changelog": "auto-changelog",
 		"plugins": "yarn run plugin:adblocker && yarn run plugin:bypass-age-restrictions",
@@ -106,7 +106,7 @@
 		"npm": "Please use yarn instead"
 	},
 	"dependencies": {
-		"@cliqz/adblocker-electron": "^1.25.2",
+		"@cliqz/adblocker-electron": "^1.26.0",
 		"@ffmpeg/core": "^0.11.0",
 		"@ffmpeg/ffmpeg": "^0.11.6",
 		"@foobar404/wave": "^2.0.4",
@@ -115,7 +115,6 @@
 		"browser-id3-writer": "^4.4.0",
 		"butterchurn": "^2.6.7",
 		"butterchurn-presets": "^2.4.7",
-		"chokidar": "^3.5.3",
 		"custom-electron-prompt": "^1.5.4",
 		"custom-electron-titlebar": "^4.1.6",
 		"electron-better-web-request": "^1.0.1",
@@ -135,8 +134,7 @@
 		"node-fetch": "^2.6.8",
 		"simple-youtube-age-restriction-bypass": "https://gitpkg.now.sh/api/pkg.tgz?url=zerodytrash/Simple-YouTube-Age-Restriction-Bypass&commit=v2.5.4",
 		"vudio": "^2.1.1",
-		"youtubei.js": "^2.9.0",
-		"ytdl-core": "^4.11.1",
+		"youtubei.js": "^3.1.1",
 		"ytpl": "^2.3.0"
 	},
 	"devDependencies": {