merge branch 'develop' into 'main' - Release v1.7.32 (include markdownlint fix)

CHANGELOG.md

@@ -4,26 +4,6 @@ All notable changes to this project will be documented in this file.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.7.34] - 2026-05-28
-
-### Fixed
-
-- **Webhook Test Duplicate Error (Issue #71)** — Skipped duplicate/replay protection for `"Test"` event types in Sonarr and Radarr webhook handlers, resolving test button failures. Resolves Gitea Issue [#71](https://git.i3omb.com/Gandalf/sofarr/issues/71).
-
-### Enhanced
-
-- **Unified Tab Header Layout & Typography Consistency (Issue #72)** — Added consistent titles, subtitles, and icons across Active Downloads, Recently Completed, and Requests tab panels, and refactored styling to use a unified flexbox design with CSS variables. Resolves Gitea Issue [#72](https://git.i3omb.com/Gandalf/sofarr/issues/72).
-
-## [1.7.33] - 2026-05-28
-
-### Added
-
-- **Requests Tab Layout Enhancement (Issue #69)** — Redesigned and unified the Requests tab container and card layouts with the Active Downloads and Recently Completed tabs. Added styled media-type borders (`tv` and `movie`) using system color variables, styled the `.requests-container` with a surface card background (`var(--surface)`) and box shadow, converted `.requests-list` to a column flexbox (`display: flex; flex-direction: column; gap: 8px;`), aligned card items to the top (`align-items: flex-start`), tighter padding (`10px 14px`), and border-radius (`6px`), and scaled `.request-type-icon` to `48px` wide and `68px` high as a clean cover-art placeholder. All changes are strictly scoped to the requests tab element selectors, leaving active and recent downloads 100% untouched. Resolves Gitea Issue [#69](https://git.i3omb.com/Gandalf/sofarr/issues/69).
-
-### Fixed
-
-- **Webhook Regression (Issue #70)** — Fixed a critical regression introduced in #62 where the Ombi webhook handler called `isReplay()` with 3 arguments instead of the new 4-argument signature (`eventType, instanceName, eventDate, contentId`). The handler now correctly passes `requestId` as the fourth `contentId` argument. This restores reliability to real Ombi webhooks, loopback fallbacks, and the Ombi test simulation buttons. Resolves Gitea Issue [#70](https://git.i3omb.com/Gandalf/sofarr/issues/70).
-
 ## [1.7.32] - 2026-05-28
 
 ### Fixed

client/src/ui/requests.js

@@ -119,7 +119,7 @@ function createRequestCard(request) {
   }
 
   const card = document.createElement('div');
-  card.className = `request-card ${request.mediaType || ''}`;
+  card.className = 'request-card';
 
   const typeIcon = document.createElement('span');
   typeIcon.className = `request-type-icon ${request.mediaType || ''}`;

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "sofarr",
-  "version": "1.7.34",
+  "version": "1.7.32",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sofarr",
-      "version": "1.7.34",
+      "version": "1.7.32",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.6.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sofarr",
-  "version": "1.7.34",
+  "version": "1.7.32",
   "description": "A personal media download dashboard that shows your downloads 'so far' while you relax on the sofa waiting for your *arr services to finish",
   "main": "server/index.js",
   "scripts": {

public/index.html

@@ -170,12 +170,8 @@
 
                 <div class="tab-panel" id="tab-downloads">
                     <div class="downloads-container">
-                        <div class="downloads-header tab-header">
-                            <div class="tab-header-title">
-                                <h2><span class="tab-header-icon">📥</span> Active Downloads</h2>
-                                <p class="tab-header-subtitle">Track and manage your active media downloads in real-time</p>
-                            </div>
-                            <div class="downloads-controls tab-header-controls">
+                        <div class="downloads-header">
+                            <div class="downloads-controls">
                                 <label class="download-client-label" for="download-client-filter">Download client:</label>
                                 <div class="download-client-filter" id="download-client-filter">
                                     <button class="download-client-dropdown-btn" id="download-client-dropdown-btn" type="button" aria-expanded="false">
@@ -204,12 +200,8 @@
 
                 <div class="tab-panel hidden" id="tab-requests">
                     <div class="requests-container">
-                        <div class="requests-header tab-header">
-                            <div class="tab-header-title">
-                                <h2><span class="tab-header-icon">📨</span> Requests</h2>
-                                <p class="tab-header-subtitle">Browse, filter, and track requests synced from Ombi</p>
-                            </div>
-                            <div class="requests-controls tab-header-controls">
+                        <div class="requests-header">
+                            <div class="requests-controls">
                                 <!-- Media Type Filter -->
                                 <div class="request-filter" id="request-type-filter">
                                     <label class="request-filter-label">Type:</label>
@@ -294,12 +286,8 @@
 
                 <div class="tab-panel hidden" id="tab-history">
                     <div class="history-container" id="history-container">
-                        <div class="history-header tab-header">
-                            <div class="tab-header-title">
-                                <h2><span class="tab-header-icon">📜</span> Recently Completed</h2>
-                                <p class="tab-header-subtitle">Review successful imports and troubleshoot failed upgrade attempts</p>
-                            </div>
-                            <div class="history-controls tab-header-controls">
+                        <div class="history-header">
+                            <div class="history-controls">
                                 <label class="history-days-label" for="history-days">Last</label>
                                 <input type="number" id="history-days" class="history-days-input" value="7" min="1" max="90">
                                 <span class="history-days-label">days</span>

public/style.css

@@ -689,61 +689,15 @@ body {
   padding: 0;
 }
 
-/* Unified Tab Headers (Issue #72) */
-.tab-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  gap: 16px;
-  margin-bottom: 20px;
-  padding-bottom: 16px;
-  border-bottom: 1px solid var(--border);
-  flex-wrap: wrap;
-}
-
-.tab-header-title {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.tab-header-title h2 {
-  margin: 0;
-  font-size: 1.25rem;
-  font-weight: 600;
-  color: var(--text-primary);
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.tab-header-icon {
-  font-size: 1.3rem;
-  display: inline-flex;
-  align-items: center;
-}
-
-.tab-header-subtitle {
-  margin: 0;
-  font-size: 0.8rem;
-  color: var(--text-muted);
-}
-
-.tab-header-controls {
+/* Downloads header and controls */
+.downloads-header {
   display: flex;
   align-items: center;
   gap: 12px;
+  margin-bottom: 12px;
   flex-wrap: wrap;
 }
 
-.tab-header, .tab-header-title h2, .tab-header-subtitle {
-  transition: color 0.3s, border-color 0.3s;
-}
-
-.downloads-header {
-  /* Inherits from .tab-header */
-}
-
 .downloads-controls {
   display: flex;
   align-items: center;
@@ -944,7 +898,11 @@ body {
 /* ===== Request Filters ===== */
 
 .requests-header {
-  /* Inherits from .tab-header */
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-bottom: 12px;
+  flex-wrap: wrap;
 }
 
 .requests-controls {
@@ -1118,7 +1076,18 @@ body {
 }
 
 .history-header {
-  /* Inherits from .tab-header */
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-bottom: 12px;
+  flex-wrap: wrap;
+}
+
+.history-header h2 {
+  margin: 0;
+  font-size: 1.2rem;
+  color: var(--text-primary);
+  flex: 1 1 auto;
 }
 
 .history-controls {
@@ -1165,7 +1134,7 @@ body {
   display: inline-flex;
   align-items: center;
   gap: 5px;
-  font-size: 0.85rem;
+  font-size: 0.82rem;
   color: var(--text-secondary);
   cursor: pointer;
   user-select: none;
@@ -2260,15 +2229,17 @@ body {
 
 /* ===== Requests Tab ===== */
 .requests-container {
-  background: var(--surface);
-  padding: 16px 20px;
-  border-radius: 8px;
-  box-shadow: 0 2px 4px var(--shadow);
-  transition: background 0.3s;
+  padding: 20px;
 }
 
 .requests-header {
-  /* Inherits from .tab-header */
+  margin-bottom: 20px;
+}
+
+.requests-header h2 {
+  margin: 0;
+  color: var(--text-primary);
+  font-size: 1.5rem;
 }
 
 .no-requests {
@@ -2278,46 +2249,37 @@ body {
 }
 
 .requests-list {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
+  display: grid;
+  gap: 12px;
+  overflow-x: hidden;
 }
 
 .request-card {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   gap: 12px;
-  padding: 10px 14px;
+  padding: 16px;
   background: var(--surface);
   border: 1px solid var(--border);
-  border-radius: 6px;
+  border-radius: 8px;
   transition: box-shadow 0.2s ease, border-color 0.2s ease;
   min-width: 0;
 }
 
-.request-card.tv {
-  border-left: 3px solid var(--series-color);
-}
-
-.request-card.movie {
-  border-left: 3px solid var(--movie-color);
-}
-
 .request-card:hover {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   border-color: var(--accent);
 }
 
 .request-type-icon {
-  font-size: 1.6rem;
+  font-size: 1.5rem;
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 48px;
-  height: 68px;
+  width: 40px;
+  height: 40px;
   background: var(--surface-alt);
-  border-radius: 4px;
-  box-shadow: 0 1px 4px var(--shadow-strong);
+  border-radius: 8px;
   flex-shrink: 0;
 }
 
@@ -2327,11 +2289,11 @@ body {
 }
 
 .request-title {
-  font-size: 0.95rem;
   font-weight: 600;
   color: var(--text-primary);
-  margin: 0 0 4px;
-  word-break: break-word;
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .request-meta {

server/app.js

@@ -133,7 +133,7 @@ function createApp({ skipRateLimits = false } = {}) {
    *                 version:
    *                   type: string
    *                   description: sofarr version
-   *                   example: "1.7.34"
+   *                   example: "1.7.32"
    *     x-code-samples:
    *       - lang: curl
    *         label: cURL

server/openapi.yaml

@@ -22,7 +22,7 @@ info:
 
     ## SSE Streaming
     Real-time updates are available via Server-Sent Events at GET /api/dashboard/stream.
-  version: 1.7.34
+  version: 1.7.32
   contact:
     name: sofarr
   license:

server/routes/webhook.js

@@ -476,10 +476,7 @@ router.post('/sonarr', webhookLimiter, (req, res) => {
   // Content-aware replay key components (Issue #62)
   const contentId = req.body.downloadId || req.body.series?.id || null;
 
-  // Skip replay protection for Test events
-  if (eventType === "Test") {
-    logToFile(`[Webhook] Sonarr Test event received — skipping replay protection`);
-  } else if (isReplay(eventType, resolvedInstanceName, eventDate, contentId)) {
+  if (isReplay(eventType, resolvedInstanceName, eventDate, contentId)) {
     logToFile(`[Webhook] Sonarr duplicate event ignored: ${eventType} @ ${eventDate} (contentId=${contentId || 'none'})`);
     return res.status(200).json({ received: true, duplicate: true });
   }
@@ -640,10 +637,7 @@ router.post('/radarr', webhookLimiter, (req, res) => {
   // Content-aware replay key components (Issue #62)
   const contentId = req.body.downloadId || req.body.movie?.id || null;
 
-  // Skip replay protection for Test events
-  if (eventType === "Test") {
-    logToFile(`[Webhook] Radarr Test event received — skipping replay protection`);
-  } else if (isReplay(eventType, resolvedInstanceName, eventDate, contentId)) {
+  if (isReplay(eventType, resolvedInstanceName, eventDate, contentId)) {
     logToFile(`[Webhook] Radarr duplicate event ignored: ${eventType} @ ${eventDate} (contentId=${contentId || 'none'})`);
     return res.status(200).json({ received: true, duplicate: true });
   }
@@ -819,10 +813,10 @@ router.post('/ombi', webhookLimiter, (req, res) => {
 
   // Use applicationUrl as instance identifier for replay protection
   const instanceName = applicationUrl || 'ombi';
+  // Use requestId + eventType + current time as replay key
   const eventDate = req.body.requestedDate || req.body.RequestedDate || new Date().toISOString();
-  const contentId = requestId || null;
 
-  if (isReplay(eventType, instanceName, eventDate, contentId)) {
+  if (isReplay(eventType, instanceName, `${requestId}-${eventDate}`)) {
     logToFile(`[Webhook] Ombi duplicate event ignored: ${eventType} requestId=${requestId}`);
     return res.status(200).json({ received: true, duplicate: true });
   }

tests/integration/dashboard.test.js

@@ -260,10 +260,19 @@ async function csrfHeaders(app) {
 // Environment
 // ---------------------------------------------------------------------------
 
-beforeEach(() => {
+beforeAll(() => {
   process.env.EMBY_URL = EMBY_BASE;
   process.env.SONARR_INSTANCES = JSON.stringify([{ id: 'sonarr-1', name: 'Main Sonarr', url: SONARR_BASE, apiKey: 'sk' }]);
   process.env.RADARR_INSTANCES = JSON.stringify([{ id: 'radarr-1', name: 'Main Radarr', url: RADARR_BASE, apiKey: 'rk' }]);
+});
+
+afterAll(() => {
+  delete process.env.EMBY_URL;
+  delete process.env.SONARR_INSTANCES;
+  delete process.env.RADARR_INSTANCES;
+});
+
+beforeEach(() => {
   seedEmptyCache();
 });
 
@@ -271,9 +280,6 @@ afterEach(() => {
   nock.cleanAll();
   invalidatePollCache();
   cache.invalidate('emby:users');
-  delete process.env.EMBY_URL;
-  delete process.env.SONARR_INSTANCES;
-  delete process.env.RADARR_INSTANCES;
 });
 
 // ---------------------------------------------------------------------------

tests/integration/webhook.test.js

@@ -387,38 +387,6 @@ describe('Replay protection', () => {
     expect(first.body.duplicate).toBeUndefined();
     expect(second.body.duplicate).toBeUndefined();
   });
-
-  it('sonarr: Test events bypass replay protection and are not flagged as duplicates', async () => {
-    const app = makeApp();
-    const payload = {
-      eventType: 'Test',
-      instanceName: 'Main Sonarr',
-      date: '2026-05-19T13:00:00.000Z'
-    };
-    const first = await postSonarr(app, payload);
-    expect(first.status).toBe(200);
-    expect(first.body.duplicate).toBeUndefined();
-
-    const second = await postSonarr(app, payload);
-    expect(second.status).toBe(200);
-    expect(second.body.duplicate).toBeUndefined();
-  });
-
-  it('radarr: Test events bypass replay protection and are not flagged as duplicates', async () => {
-    const app = makeApp();
-    const payload = {
-      eventType: 'Test',
-      instanceName: 'Main Radarr',
-      date: '2026-05-19T13:00:00.000Z'
-    };
-    const first = await postRadarr(app, payload);
-    expect(first.status).toBe(200);
-    expect(first.body.duplicate).toBeUndefined();
-
-    const second = await postRadarr(app, payload);
-    expect(second.status).toBe(200);
-    expect(second.body.duplicate).toBeUndefined();
-  });
 });
 
 // ---------------------------------------------------------------------------