fix: per video volume boost was disabled when adjusting boost

YouTube-Enhancer · Jan 22, 2024 · daef94c · daef94c
1 parent 2000303
commit daef94c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/pages/content/index.tsx b/src/pages/content/index.tsx
@@ -23,7 +23,13 @@ import { addScreenshotButton, removeScreenshotButton } from "@/src/features/scre
 import adjustSpeedOnScrollWheel from "@/src/features/scrollWheelSpeedControl";
 import adjustVolumeOnScrollWheel from "@/src/features/scrollWheelVolumeControl";
 import { promptUserToResumeVideo, setupVideoHistory } from "@/src/features/videoHistory";
-import volumeBoost, { addVolumeBoostButton, disableVolumeBoost, enableVolumeBoost, removeVolumeBoostButton } from "@/src/features/volumeBoost";
+import volumeBoost, {
+	addVolumeBoostButton,
+	applyVolumeBoost,
+	disableVolumeBoost,
+	enableVolumeBoost,
+	removeVolumeBoostButton
+} from "@/src/features/volumeBoost";
 import { i18nService } from "@/src/i18n";
 import eventManager from "@/utils/EventManager";
 import {
@@ -166,6 +172,13 @@ window.addEventListener("DOMContentLoaded", function () {
 						}
 						break;
 					}
+					case "volumeBoostAmountChange": {
+						const {
+							data: { volumeBoostAmount }
+						} = message;
+						applyVolumeBoost(volumeBoostAmount);
+						break;
+					}
 					case "playerSpeedChange": {
 						const {
 							data: { enableForcedPlaybackSpeed, playerSpeed }

diff --git a/src/pages/inject/index.tsx b/src/pages/inject/index.tsx
@@ -271,7 +271,6 @@ const storageChangeHandler = async (changes: StorageChanges, areaName: string) =
 		},
 		enable_volume_boost: (newValue) => {
 			sendExtensionOnlyMessage("volumeBoostChange", {
-				volumeBoostAmount: options.volume_boost_amount,
 				volumeBoostEnabled: newValue,
 				volumeBoostMode: options.volume_boost_mode
 			});
@@ -293,15 +292,12 @@ const storageChangeHandler = async (changes: StorageChanges, areaName: string) =
 			});
 		},
 		volume_boost_amount: (newValue) => {
-			sendExtensionOnlyMessage("volumeBoostChange", {
-				volumeBoostAmount: newValue,
-				volumeBoostEnabled: options.enable_volume_boost,
-				volumeBoostMode: options.volume_boost_mode
+			sendExtensionOnlyMessage("volumeBoostAmountChange", {
+				volumeBoostAmount: newValue
 			});
 		},
 		volume_boost_mode: (newValue) => {
 			sendExtensionOnlyMessage("volumeBoostChange", {
-				volumeBoostAmount: options.volume_boost_amount,
 				volumeBoostEnabled: options.enable_volume_boost,
 				volumeBoostMode: newValue
 			});

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -164,10 +164,8 @@ export type ExtensionSendOnlyMessageMappings = {
 	scrollWheelSpeedControlChange: DataResponseMessage<"scrollWheelSpeedControlChange", { scrollWheelSpeedControlEnabled: boolean }>;
 	scrollWheelVolumeControlChange: DataResponseMessage<"scrollWheelVolumeControlChange", { scrollWheelVolumeControlEnabled: boolean }>;
 	videoHistoryChange: DataResponseMessage<"videoHistoryChange", { videoHistoryEnabled: boolean }>;
-	volumeBoostChange: DataResponseMessage<
-		"volumeBoostChange",
-		{ volumeBoostAmount?: number; volumeBoostEnabled: boolean; volumeBoostMode: VolumeBoostMode }
-	>;
+	volumeBoostAmountChange: DataResponseMessage<"volumeBoostAmountChange", { volumeBoostAmount: number }>;
+	volumeBoostChange: DataResponseMessage<"volumeBoostChange", { volumeBoostEnabled: boolean; volumeBoostMode: VolumeBoostMode }>;
 };
 export type FilterMessagesBySource<T extends Messages, S extends MessageSource> = {
 	[K in keyof T]: Extract<T[K], { source: S }>;