diff --git a/CHANGELOG.md b/CHANGELOG.md index 057100c..cc7a85b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ Updating is changing the image tag and redeploying. The database migrates itself forward on start, and no release so far has needed anything else — where a release changes what your listeners see, it says so. +## 1.9.1 — 2026-09-16 + +### Fixed + +- **The Adverts page was blank for anyone with an ad blocker.** 1.9.0 named the panel on that + page `ad-panel` and its notes `ad-note`. EasyList, which uBlock Origin, AdGuard and most other + blockers load by default, hides any element with those names, so the page arrived complete and + the browser hid it. Nothing was lost: every cut, rule and decision was there all along. The + names on these pages no longer contain "ad", "advert" or "sponsor" as a word, and a test now + fails if one comes back. The same change covers the cuts on the episode page and the dashboard. + ## 1.9.0 — 2026-09-16 ### Changed — adverts you can see, and put back diff --git a/README.md b/README.md index fd58836..2597315 100644 --- a/README.md +++ b/README.md @@ -380,7 +380,7 @@ Reading the words is the slow part of a pass. With an NVIDIA card, use the GPU i instead of the regular one — same app, same data, different tag: ``` -ghcr.io/antoine-debroye/selfpod:1.9.0-cuda +ghcr.io/antoine-debroye/selfpod:1.9.1-cuda ``` It is amd64 only, about two and a half gigabytes, and uses the `small` model by default, diff --git a/doc/selfpod-spec.md b/doc/selfpod-spec.md index 41fe846..fdba2c0 100644 --- a/doc/selfpod-spec.md +++ b/doc/selfpod-spec.md @@ -1228,6 +1228,10 @@ states (Cut, Waiting, Kept, Restored here). Boundaries are taught by typing thei stretches by time on an episode page, as well as by words in its transcript. The episode page plays the original beside the published copy. +**Amended in 1.9.1.** No class or id on these pages may contain *ad*, *ads*, *advert*, +*sponsor* or *promo* as a word: ad blockers hide elements by those names whatever the server +sends (`test/integration/adblock-names.test.js`). + **What it costs.** Measured on the owner's French show on a desktop: the `base` model at about 40× real time and `small` at about 20×; on a two-thread Core-class NAS expect several times real time for `base`. The image grows by about 260 MB for diff --git a/package-lock.json b/package-lock.json index b90929c..3bec187 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "selfpod", - "version": "1.9.0", + "version": "1.9.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "selfpod", - "version": "1.9.0", + "version": "1.9.1", "license": "MIT", "dependencies": { "@fastify/cookie": "11.1.2", diff --git a/package.json b/package.json index 67864ab..b71c345 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "selfpod", - "version": "1.9.0", + "version": "1.9.1", "description": "SelfPod \u2014 a self-hosted podcast server. Drop a file in a folder; it's an episode.", "license": "MIT", "type": "module", diff --git a/src/services/adverts-view.js b/src/services/adverts-view.js index 035c0ff..a55725f 100644 --- a/src/services/adverts-view.js +++ b/src/services/adverts-view.js @@ -68,7 +68,7 @@ export function describeWork(owed) { export function workStripHtml(show, owed) { const sentence = describeWork(owed); if (!sentence) return ''; - return `${escapeHtml(sentence)}`; + return `${escapeHtml(sentence)}`; } export function createAdvertsView({ db, adDetect, transcriber, episodes, shows }) { diff --git a/src/web/public/css/app.css b/src/web/public/css/app.css index 331497e..5d04e30 100644 --- a/src/web/public/css/app.css +++ b/src/web/public/css/app.css @@ -1562,7 +1562,7 @@ dialog.modal[open]::backdrop { animation: sp-fade-in .16s ease-out both; } .ep-table--pinned .dur, .ep-table--pinned .size, .ep-table--pinned .ep-reach, - .ep-table--pinned .ep-adverts, + .ep-table--pinned .ep-cuts, .ep-table--pinned .ep-status { display: inline-block; vertical-align: middle; @@ -2140,28 +2140,28 @@ dialog.modal[open]::backdrop { animation: sp-fade-in .16s ease-out both; } cut is solid, waiting is hatched, restored is an outline. The word beside each stretch says the same thing again. ═══════════════════════════════════════════════════════════════════════════ */ -.ad-work:empty { display: none; } -.ad-work { +.cuts-work:empty { display: none; } +.cuts-work { display: flex; align-items: center; gap: 10px; margin-bottom: 14px; padding: 9px 14px; border-radius: var(--r-sm); background: var(--teal-soft); color: #1E547A; font-size: 13.5px; } -.ad-work::before { +.cuts-work::before { content: ''; flex: none; width: 8px; height: 8px; border-radius: 50%; background: var(--teal); animation: sp-pulse 1.6s ease-in-out infinite; } -.ad-totals { +.cuts-totals { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 12px; margin: 0 0 14px; } -.ad-totals__item { +.cuts-totals__item { background: var(--card); border: 1px solid var(--line); border-radius: var(--r); padding: 12px 14px; box-shadow: var(--shadow); min-width: 0; } -.ad-totals dt { font-size: 11.5px; color: var(--ink-soft); text-transform: uppercase; letter-spacing: .04em; } -.ad-totals dd { margin: 2px 0 0; font-family: var(--serif); font-size: 26px; font-weight: 600; color: var(--ink); } -.ad-note { font-size: 13px; margin: -4px 0 14px; color: var(--ink-soft); } -.ad-note--warn { color: #8A5E10; } +.cuts-totals dt { font-size: 11.5px; color: var(--ink-soft); text-transform: uppercase; letter-spacing: .04em; } +.cuts-totals dd { margin: 2px 0 0; font-family: var(--serif); font-size: 26px; font-weight: 600; color: var(--ink); } +.cuts-note { font-size: 13px; margin: -4px 0 14px; color: var(--ink-soft); } +.cuts-note--warn { color: #8A5E10; } .rules { list-style: none; margin: 8px 0 0; } .rule { @@ -2234,36 +2234,36 @@ a.cut-pill:hover { text-decoration: underline; } } .stretch__play:hover { background: var(--paper-2); } .stretch__play.is-playing { background: var(--accent); border-color: var(--accent); color: #fff; } -.ad-timeline__more { margin-top: 12px; } -.ad-settings > summary { cursor: pointer; margin-bottom: 0; } -.ad-settings[open] > summary { margin-bottom: 14px; } -.ad-settings__check { display: flex; flex-wrap: wrap; align-items: center; gap: 10px; margin-top: 14px; padding-top: 14px; border-top: 1px solid var(--line); } -.meta--adverts { margin-top: 2px; } -.ep-adverts { white-space: nowrap; } -.ep-table--pinned .ep-adverts:empty { display: none; } +.cuts-timeline__more { margin-top: 12px; } +.cuts-settings > summary { cursor: pointer; margin-bottom: 0; } +.cuts-settings[open] > summary { margin-bottom: 14px; } +.cuts-settings__check { display: flex; flex-wrap: wrap; align-items: center; gap: 10px; margin-top: 14px; padding-top: 14px; border-top: 1px solid var(--line); } +.meta--cuts { margin-top: 2px; } +.ep-cuts { white-space: nowrap; } +.ep-table--pinned .ep-cuts:empty { display: none; } /* The episode page's Adverts card. */ -.ep-ad__hold { margin-bottom: 14px; } -.ep-ad__summary { margin-bottom: 12px; } -.ep-ad__headline { font-size: 14px; line-height: 1.5; } -.ep-ad__figures { display: flex; flex-wrap: wrap; gap: 6px 28px; margin: 10px 0 6px; } -.ep-ad__figures div { min-width: 0; } -.ep-ad__figures dt { font-size: 11.5px; color: var(--ink-soft); text-transform: uppercase; letter-spacing: .04em; } -.ep-ad__figures dd { margin: 2px 0 0; font-size: 13.5px; } -.ep-ad__players { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; margin: 14px 0; } -.ep-ad__player { min-width: 0; } -.ep-ad__player audio { width: 100%; margin-top: 4px; } +.ep-cuts__hold { margin-bottom: 14px; } +.ep-cuts__summary { margin-bottom: 12px; } +.ep-cuts__headline { font-size: 14px; line-height: 1.5; } +.ep-cuts__figures { display: flex; flex-wrap: wrap; gap: 6px 28px; margin: 10px 0 6px; } +.ep-cuts__figures div { min-width: 0; } +.ep-cuts__figures dt { font-size: 11.5px; color: var(--ink-soft); text-transform: uppercase; letter-spacing: .04em; } +.ep-cuts__figures dd { margin: 2px 0 0; font-size: 13.5px; } +.ep-cuts__players { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; margin: 14px 0; } +.ep-cuts__player { min-width: 0; } +.ep-cuts__player audio { width: 100%; margin-top: 4px; } .teach-range { margin: 6px 0 4px; padding: 12px 14px; background: var(--paper-2); border-radius: var(--r-sm); } .teach-range__time { width: 88px; flex: none; } -.ep-ad__more { margin-top: 8px; } +.ep-cuts__more { margin-top: 8px; } /* The words are evidence for the card above them, not a card of their own. */ -.ep-ad__heard { margin-top: 20px; padding-top: 16px; border-top: 1px solid var(--line); } +.ep-cuts__heard { margin-top: 20px; padding-top: 16px; border-top: 1px solid var(--line); } @media (max-width: 640px) { - .ad-totals { grid-template-columns: repeat(2, minmax(0, 1fr)); } + .cuts-totals { grid-template-columns: repeat(2, minmax(0, 1fr)); } .rule, .stretch { flex-wrap: wrap; gap: 8px; } .rule__main, .stretch__main { flex: 1 1 100%; } .rule__act, .stretch__act { justify-content: flex-start; } - .ep-ad__players { grid-template-columns: 1fr; } + .ep-cuts__players { grid-template-columns: 1fr; } .rule-teach select, .tx__teach-row select, .teach-range__row select { flex: 1 1 100%; } } diff --git a/src/web/public/js/app.js b/src/web/public/js/app.js index 4251325..3d86b71 100644 --- a/src/web/public/js/app.js +++ b/src/web/public/js/app.js @@ -440,7 +440,7 @@ var button = event.target.closest('[data-pick-from-player]'); if (!button) return; var form = button.closest('form'); - var card = button.closest('#episode-adverts') || document; + var card = button.closest('#episode-cuts') || document; // Whichever copy of the original was listened to last: the player under the bar, // or the one a ▶ on a stretch used. Reading only the first would fill in 0:00 for // someone who found the moment by pressing ▶. diff --git a/src/web/routes/events.js b/src/web/routes/events.js index 7009eea..184526f 100644 --- a/src/web/routes/events.js +++ b/src/web/routes/events.js @@ -99,7 +99,7 @@ export default async function eventRoutes(fastify, { events, logger, shows, adPi } catch (err) { logger?.debug({ err }, 'could not work out what a show owes for the live strip'); } - send(`ad-work-${show.id}`, workStripHtml(show, owed)); + send(`cuts-work-${show.id}`, workStripHtml(show, owed)); }; /* A trigger only: the panel, the episode table, the card and the episode page each fetch themselves again when it arrives. */ diff --git a/src/web/views/partials/ad-panel.eta b/src/web/views/partials/ad-panel.eta index c0da3f1..79cf492 100644 --- a/src/web/views/partials/ad-panel.eta +++ b/src/web/views/partials/ad-panel.eta @@ -9,13 +9,13 @@ const rules = it.rules ?? { rows: [], kept: [] }; const timeline = it.timeline ?? { episodes: [], nextBefore: null }; %> -
-
<%~ it.workHtml ?? '' %>
+
<%~ it.workHtml ?? '' %>
<% if (it.formError) { %> @@ -27,16 +27,16 @@
<% } else { %> -
+
<% for (const figure of it.totals ?? []) { %> -
<%= figure.label %>
<%= figure.value %>
+
<%= figure.label %>
<%= figure.value %>
<% } %>
- <% if (it.heldSentence) { %>

<%= it.heldSentence %>

<% } %> - <% if (it.failedSentence) { %>

<%= it.failedSentence %>

<% } %> - <% if (it.engineSentence) { %>

<%= it.engineSentence %>

<% } %> + <% if (it.heldSentence) { %>

<%= it.heldSentence %>

<% } %> + <% if (it.failedSentence) { %>

<%= it.failedSentence %>

<% } %> + <% if (it.engineSentence) { %>

<%= it.engineSentence %>

<% } %> -
+
What SelfPod cuts
<% if (rules.rows.length) { %>
    @@ -49,7 +49,7 @@
    <% for (const action of rule.actions) { %> - <%~ include('./ad-action.eta', { action, target: '#ad-panel', returnTo: null }) %> + <%~ include('./ad-action.eta', { action, target: '#cuts-panel', returnTo: null }) %> <% } %>
    @@ -60,7 +60,7 @@ <% } %>
    + hx-post="/ui/shows/<%= slug %>/ad-markers" hx-target="#cuts-panel" hx-swap="outerHTML">