Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/controls/volume/useVolumeControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,19 @@ function normalizeVolume(volume) {
return clampVolume(volume) / 100;
}

function getUrlMuted() {
try {
return new URLSearchParams(window.location.search).get("muted") === "true";
} catch {
return false;
}
}

export function useVolumeControl(core) {
const { savedVolume, setSavedVolume } = usePreferences();
const urlMuted = getUrlMuted();
const [volume, setVolume] = useState(savedVolume);
const [isMuted, setIsMuted] = useState(false);
const [isMuted, setIsMuted] = useState(urlMuted);
const hasAppliedInitialVolume = useRef(false);

const handleVolumeChange = useCallback(
Expand All @@ -36,15 +45,22 @@ export function useVolumeControl(core) {
useEffect(() => {
const handler = (event) => {
// Re-apply initial volume after the player is ready, after Kick sets it
// to their default of 0.6.
// to their default of 0.6. Respect muted=true in URL (embed hosts that pass ?muted=true).
if (
!hasAppliedInitialVolume.current &&
event.data?.arg?.key === "state" &&
event.data?.arg?.value === "Ready"
) {
console.debug("[Kickstiny] Re-applying saved volume");
hasAppliedInitialVolume.current = true;
handleVolumeChange(savedVolume);
if (urlMuted) {
core.setVolume(normalizeVolume(savedVolume));
core.setMuted(true);
setVolume(savedVolume);
setIsMuted(true);
} else {
handleVolumeChange(savedVolume);
}
}

if (event.data?.arg?.key === "muted") {
Expand All @@ -60,7 +76,7 @@ export function useVolumeControl(core) {
return () => {
core.worker.removeEventListener("message", handler);
};
}, [core, savedVolume, isMuted, handleVolumeChange]);
}, [core, savedVolume, isMuted, handleVolumeChange, urlMuted]);

return {
volume,
Expand Down