Merge branch 'local-upstream/master' into add-crossfade-menu-options

Author: Araxeus

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",

package.json

@@ -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.7",
 		"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": {