From 0d479f3bfad83baf90ce4cfdd579e5ed1252b2cb Mon Sep 17 00:00:00 2001
From: Frank Stellmacher <171614930+Psychotoxical@users.noreply.github.com>
Date: Thu, 4 Jun 2026 01:18:52 +0200
Subject: [PATCH] Fix Random Mix audiobook exclusion: click area and false
 matches (#973)

* fix(random-mix): limit exclusion toggle click area to checkbox and title

The audiobook exclusion was a full-width label wrapping the checkbox,
title and description, so clicking empty space or the description text
toggled it. Make only the checkbox and its title clickable; the
description and surrounding space are no longer hit targets.

* fix(random-mix): stop excluding Thriller and Fantasy as audiobook genres

These keywords match regular music (e.g. Trance/Metal genre tags, a track
titled "Thriller") because the exclusion checks genre, title, album and
artist by substring, dropping a few legit songs per mix. Remove both from
the audiobook keyword list.

* docs(changelog): random mix audiobook exclusion fixes (#973)
---
 CHANGELOG.md                                       |  7 +++++++
 src/components/randomMix/RandomMixFiltersPanel.tsx | 14 ++++++++++----
 src/utils/componentHelpers/randomMixHelpers.ts     |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85bd3f90..59897908 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -826,6 +826,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * A pass of UI/CSS fixes: keyboard focus rings now sit inside the focused element, so they're no longer clipped at the edge of cards, rails, the player bar, queue tabs or search fields; the page, Help and Settings search fields share one consistent shape and focus highlight; the column-visibility dropdown on track tables no longer gets cut off on short lists (e.g. a single favorited song); and the Theme settings list rounds its corners to match its section.
 
+### Random Mix — audiobook exclusion no longer drops normal music
+
+**By [@Psychotoxical](https://github.com/Psychotoxical), PR [#973](https://github.com/Psychotoxical/psysonic/pull/973) — reported by zunoz on Discord**
+
+* "Exclude audiobooks & radio plays" no longer treats **Thriller** and **Fantasy** as audiobook keywords. They matched regular music (Trance/Metal genre tags, a track titled "Thriller") because the filter scans genre, title, album and artist, so a handful of legitimate songs were dropped from each mix.
+* The exclusion's toggle area is tightened so only the checkbox and its title respond to a click — the description text and surrounding empty space no longer toggle it.
+
 ## [1.46.0] - 2026-05-18
 
 > **🙏 Special thanks to [@zz5zz](https://github.com/zz5zz)** for his tireless quirk-spotting and bug reports on the [Psysonic Discord](https://discord.gg/AMnDRErm4u) — several of the polish fixes in this release landed directly off the back of his messages.
diff --git a/src/components/randomMix/RandomMixFiltersPanel.tsx b/src/components/randomMix/RandomMixFiltersPanel.tsx
index e6345757..117a7be6 100644
--- a/src/components/randomMix/RandomMixFiltersPanel.tsx
+++ b/src/components/randomMix/RandomMixFiltersPanel.tsx
@@ -92,18 +92,24 @@ export default function RandomMixFiltersPanel({
             {t('randomMix.filterPanelDesc')}
           </p>
 
-          <label style={{ display: 'flex', alignItems: 'flex-start', gap: '0.5rem', cursor: 'pointer', fontSize: 13, marginBottom: '0.6rem' }}>
+          <div style={{ display: 'flex', alignItems: 'flex-start', gap: '0.5rem', fontSize: 13, marginBottom: '0.6rem' }}>
             <input
+              id="random-mix-exclude-audiobooks"
               type="checkbox"
               checked={excludeAudiobooks}
               onChange={e => setExcludeAudiobooks(e.target.checked)}
-              style={{ marginTop: 2 }}
+              style={{ marginTop: 2, flexShrink: 0, cursor: 'pointer' }}
             />
             <div>
-              <div style={{ fontWeight: 500, color: 'var(--text-primary)' }}>{t('randomMix.excludeAudiobooks')}</div>
+              <label
+                htmlFor="random-mix-exclude-audiobooks"
+                style={{ fontWeight: 500, color: 'var(--text-primary)', cursor: 'pointer', display: 'inline-block' }}
+              >
+                {t('randomMix.excludeAudiobooks')}
+              </label>
               <div style={{ fontSize: 11, color: 'var(--text-muted)', marginTop: 2 }}>{t('randomMix.excludeAudiobooksDesc')}</div>
             </div>
-          </label>
+          </div>
 
           <button
             className="btn btn-ghost"
diff --git a/src/utils/componentHelpers/randomMixHelpers.ts b/src/utils/componentHelpers/randomMixHelpers.ts
index e1995056..2ad0c5d7 100644
--- a/src/utils/componentHelpers/randomMixHelpers.ts
+++ b/src/utils/componentHelpers/randomMixHelpers.ts
@@ -4,8 +4,8 @@ import { passesMixMinRatings, type MixMinRatingsConfig } from '../mix/mixRatingF
 export const AUDIOBOOK_GENRES = [
   'hörbuch', 'hoerbuch', 'hörspiel', 'hoerspiel',
   'audiobook', 'audio book', 'spoken word', 'spokenword',
-  'podcast', 'kapitel', 'thriller', 'krimi', 'speech',
-  'fantasy', 'comedy', 'literature',
+  'podcast', 'kapitel', 'krimi', 'speech',
+  'comedy', 'literature',
 ];
 
 export function formatRandomMixDuration(seconds: number): string {