Merge branch 'develop' into feat(discord-agent)/multiple-discord-ids

defaultdino · web-flow · commit 34fc4cbf8a93 · 2026-04-13T10:59:05.000+02:00
diff --git a/charts/seerr-chart/Chart.yaml b/charts/seerr-chart/Chart.yaml
@@ -3,7 +3,7 @@ kubeVersion: '>=1.23.0-0'
 name: seerr-chart
 description: Seerr helm chart for Kubernetes
 type: application
-version: 3.3.1
+version: 3.4.1
 # renovate: image=ghcr.io/seerr-team/seerr
 appVersion: 'v3.1.0'
 maintainers:
diff --git a/charts/seerr-chart/README.md b/charts/seerr-chart/README.md
@@ -1,6 +1,6 @@
 # seerr-chart
 
-![Version: 3.3.1](https://img.shields.io/badge/Version-3.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.1.0](https://img.shields.io/badge/AppVersion-v3.1.0-informational?style=flat-square)
+![Version: 3.4.1](https://img.shields.io/badge/Version-3.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.1.0](https://img.shields.io/badge/AppVersion-v3.1.0-informational?style=flat-square)
 
 Seerr helm chart for Kubernetes
 
@@ -44,12 +44,13 @@ If `replicaCount` value was used - remove it. Helm update should work fine after
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
-| config | object | `{"persistence":{"accessModes":["ReadWriteOnce"],"annotations":{},"existingClaim":"","name":"","size":"5Gi","volumeName":""}}` | Creating PVC to store configuration |
+| config | object | `{"persistence":{"accessModes":["ReadWriteOnce"],"annotations":{},"existingClaim":"","name":"","size":"5Gi","subPath":"","volumeName":""}}` | Creating PVC to store configuration |
 | config.persistence.accessModes | list | `["ReadWriteOnce"]` | Access modes of persistent disk |
 | config.persistence.annotations | object | `{}` | Annotations for PVCs |
 | config.persistence.existingClaim | string | `""` | Specify an existing `PersistentVolumeClaim` to use. If this value is provided, the default PVC will not be created |
 | config.persistence.name | string | `""` | Config name |
 | config.persistence.size | string | `"5Gi"` | Size of persistent disk |
+| config.persistence.subPath | string | `""` | Subpath of the pvc which should be mounted |
 | config.persistence.volumeName | string | `""` | Name of the permanent volume to reference in the claim. Can be used to bind to existing volumes. |
 | extraEnv | list | `[]` | Environment variables to add to the seerr pods |
 | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the seerr pods |
diff --git a/charts/seerr-chart/templates/statefulset.yaml b/charts/seerr-chart/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /api/v1/status
+              path: /api/v1/settings/public
               port: http
             {{- if .Values.probes.livenessProbe.initialDelaySeconds }}
             initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}
@@ -63,7 +63,7 @@ spec:
             {{- end }}
           readinessProbe:
             httpGet:
-              path: /api/v1/status
+              path: /api/v1/settings/public
               port: http
             {{- if .Values.probes.readinessProbe.initialDelaySeconds }}
             initialDelaySeconds: {{ .Values.probes.readinessProbe.initialDelaySeconds }}
@@ -97,6 +97,7 @@ spec:
           volumeMounts:
             - name: config
               mountPath: /app/config
+              subPath: {{ .Values.config.persistence.subPath }}
           {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
diff --git a/charts/seerr-chart/values.yaml b/charts/seerr-chart/values.yaml
@@ -88,6 +88,8 @@ config:
     volumeName: ''
     # -- Specify an existing `PersistentVolumeClaim` to use. If this value is provided, the default PVC will not be created
     existingClaim: ''
+    # -- Subpath of the pvc which should be mounted
+    subPath: ''
 
 ingress:
   enabled: false
diff --git a/docs/extending-seerr/reverse-proxy.mdx b/docs/extending-seerr/reverse-proxy.mdx
@@ -293,7 +293,7 @@ This is a third-party documentation maintained by the community. We can't provid
       log global
       option httplog
       http-response set-header Strict-Transport-Security max-age=15552000
-      option httpchk GET /api/v1/status
+      option httpchk GET /api/v1/settings/public
       timeout connect 30000
       timeout server 30000
       retries 3
diff --git a/docs/getting-started/docker.mdx b/docs/getting-started/docker.mdx
@@ -61,7 +61,7 @@ docker run -d \
   -p 5055:5055 \
   -v /path/to/appdata/config:/app/config \
   --restart unless-stopped \
-  --health-cmd "wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1" \
+  --health-cmd "wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/settings/public || exit 1" \
   --health-start-period 20s \
   --health-timeout 3s \
   --health-interval 15s \
@@ -116,7 +116,7 @@ services:
     volumes:
       - /path/to/appdata/config:/app/config
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1
+      test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/settings/public || exit 1
       start_period: 20s
       timeout: 3s
       interval: 15s
@@ -163,7 +163,7 @@ docker volume create seerr-data
 or the Docker Desktop app:
 1. Open the Docker Desktop app
 2. Head to the Volumes tab
-3. Click on the "New Volume" button near the top right
+3. Click on the "Create a volume" in the center of the page. Or if you have other volumes already, click on the "Create" button on the top right of the page.
 4. Enter a name for the volume (example: `seerr-data`) and hit "Create"
 
 Then, create and start the Seerr container:
@@ -179,7 +179,7 @@ docker run -d `
   -p 5055:5055 `
   -v seerr-data:/app/config `
   --restart unless-stopped `
-  --health-cmd "wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1" `
+  --health-cmd "wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/settings/public || exit 1" `
   --health-start-period 20s `
   --health-timeout 3s `
   --health-interval 15s `
@@ -217,7 +217,7 @@ docker run -d ^
   -p 5055:5055 ^
   -v seerr-data:/app/config ^
   --restart unless-stopped ^
-  --health-cmd "wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1" ^
+  --health-cmd "wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/settings/public || exit 1" ^
   --health-start-period 20s ^
   --health-timeout 3s ^
   --health-interval 15s ^
@@ -260,7 +260,7 @@ services:
     volumes:
       - seerr-data:/app/config
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1
+      test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/settings/public || exit 1
       start_period: 20s
       timeout: 3s
       interval: 15s
diff --git a/docs/migration-guide.mdx b/docs/migration-guide.mdx
@@ -82,7 +82,7 @@ Summary of changes :
       volumes:
         - /path/to/appdata/config:/app/config
       healthcheck:
-        test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1
+        test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/settings/public || exit 1
         start_period: 20s
         timeout: 3s
         interval: 15s
@@ -126,7 +126,7 @@ Summary of changes :
       volumes:
         - seerr-data:/app/config
       healthcheck:
-        test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1
+        test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/settings/public || exit 1
         start_period: 20s
         timeout: 3s
         interval: 15s
diff --git a/docs/using-seerr/notifications/webhook.md b/docs/using-seerr/notifications/webhook.md
@@ -98,6 +98,7 @@ These following special variables are only included in media-related notificatio
 | Variable                      | Value                                                                                                          |
 | ------------------------------| -------------------------------------------------------------------------------------------------------------- |
 | `{{media_type}}`              | The media type (`movie` or `tv`)                                                                               |
+| `{{media_imdbid}}`            | The media's IMDb ID                                                                                            |
 | `{{media_tmdbid}}`            | The media's TMDB ID                                                                                            |
 | `{{media_tvdbid}}`            | The media's TheTVDB ID                                                                                         |
 | `{{media_status}}`            | The media's availability status (`UNKNOWN`, `PENDING`, `PROCESSING`, `PARTIALLY_AVAILABLE`, or `AVAILABLE`)    |
diff --git a/server/api/jellyfin.ts b/server/api/jellyfin.ts
@@ -138,11 +138,14 @@ class JellyfinAPI extends ExternalAPI {
         ? deviceId
         : Buffer.from('BOT_seerr').toString('base64');
 
-    let authHeaderVal: string;
+    const version =
+      settings.main.mediaServerType === MediaServerType.EMBY
+        ? '1.0.0'
+        : getAppVersion();
+
+    let authHeaderVal = `MediaBrowser Client="Seerr", Device="Seerr", DeviceId="${safeDeviceId}", Version="${version}"`;
     if (authToken) {
-      authHeaderVal = `MediaBrowser Client="Seerr", Device="Seerr", DeviceId="${safeDeviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
-    } else {
-      authHeaderVal = `MediaBrowser Client="Seerr", Device="Seerr", DeviceId="${safeDeviceId}", Version="${getAppVersion()}"`;
+      authHeaderVal += `, Token="${authToken}"`;
     }
 
     super(
diff --git a/server/entity/User.ts b/server/entity/User.ts
@@ -194,7 +194,7 @@ export class User {
 
   public async generatePassword(): Promise<void> {
     const password = generatePassword.randomPassword({ length: 16 });
-    this.setPassword(password);
+    await this.setPassword(password);
 
     const { applicationTitle, applicationUrl } = getSettings().main;
     try {
diff --git a/server/lib/notifications/agents/webhook.ts b/server/lib/notifications/agents/webhook.ts
@@ -25,6 +25,7 @@ const KeyMap: Record<string, string | KeyMapFunction> = {
   notifyuser_avatar: 'notifyUser.avatar',
   notifyuser_settings_discordIds: 'notifyUser.settings.discordIds',
   notifyuser_settings_telegramChatId: 'notifyUser.settings.telegramChatId',
+  media_imdbid: 'media.imdbId',
   media_tmdbid: 'media.tmdbId',
   media_tvdbid: 'media.tvdbId',
   media_type: 'media.mediaType',
diff --git a/server/lib/overseerrMerge.ts b/server/lib/overseerrMerge.ts
@@ -89,6 +89,27 @@ const checkOverseerrMerge = async (): Promise<boolean> => {
     await dbConnection.query('PRAGMA foreign_keys=ON');
   }
 
+  // Fix corrupted quota values carried over from Overseerr
+  try {
+    await dbConnection.query(
+      `UPDATE user SET movieQuotaLimit = NULL WHERE typeof(movieQuotaLimit) = 'text'`
+    );
+    await dbConnection.query(
+      `UPDATE user SET movieQuotaDays = NULL WHERE typeof(movieQuotaDays) = 'text'`
+    );
+    await dbConnection.query(
+      `UPDATE user SET tvQuotaLimit = NULL WHERE typeof(tvQuotaLimit) = 'text'`
+    );
+    await dbConnection.query(
+      `UPDATE user SET tvQuotaDays = NULL WHERE typeof(tvQuotaDays) = 'text'`
+    );
+  } catch (error) {
+    logger.error('Failed to clean up corrupted quota values', {
+      label: 'Seerr Migration',
+      error: error.message,
+    });
+  }
+
   // MediaStatus.Blacklisted was added before MediaStatus.Deleted in Jellyseerr
   try {
     const mediaRepository = getRepository(Media);
diff --git a/server/routes/auth.ts b/server/routes/auth.ts
@@ -671,9 +671,11 @@ authRoutes.post('/logout', async (req, res, next) => {
             await axios.delete(`${baseUrl}/Devices`, {
               params: { Id: user.jellyfinDeviceId },
               headers: {
-                'X-Emby-Authorization': `MediaBrowser Client="Seerr", Device="Seerr", DeviceId="seerr", Version="${getAppVersion()}", Token="${
-                  settings.jellyfin.apiKey
-                }"`,
+                'X-Emby-Authorization': `MediaBrowser Client="Seerr", Device="Seerr", DeviceId="seerr", Version="${
+                  settings.main.mediaServerType === MediaServerType.EMBY
+                    ? '1.0.0'
+                    : getAppVersion()
+                }", Token="${settings.jellyfin.apiKey}"`,
               },
             });
           } catch (error) {
diff --git a/server/routes/avatarproxy.ts b/server/routes/avatarproxy.ts
@@ -27,7 +27,11 @@ async function initAvatarImageProxy() {
     const authToken = getSettings().jellyfin.apiKey;
     _avatarImageProxy = new ImageProxy('avatar', '', {
       headers: {
-        'X-Emby-Authorization': `MediaBrowser Client="Seerr", Device="Seerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`,
+        'X-Emby-Authorization': `MediaBrowser Client="Seerr", Device="Seerr", DeviceId="${deviceId}", Version="${
+          getSettings().main.mediaServerType === MediaServerType.EMBY
+            ? '1.0.0'
+            : getAppVersion()
+        }", Token="${authToken}"`,
       },
     });
   }
diff --git a/server/routes/request.test.ts b/server/routes/request.test.ts
@@ -212,3 +212,56 @@ describe('PUT /request/:requestId (movie)', () => {
     assert.strictEqual(saved.rootFolder, '/updated/movies');
   });
 });
+
+describe('POST /request/:requestId/:status', () => {
+  const cases = [
+    { action: 'approve', expected: MediaRequestStatus.APPROVED },
+    { action: 'decline', expected: MediaRequestStatus.DECLINED },
+  ] as const;
+
+  for (const { action, expected } of cases) {
+    it(`transitions to ${action}d and records the acting user`, async () => {
+      const repo = getRepository(MediaRequest);
+      const pending = await seedRequest();
+      const admin = await loginAs('admin@seerr.dev', 'test1234');
+
+      const res = await admin.post(`/request/${pending.id}/${action}`);
+
+      assert.strictEqual(res.status, 200);
+      assert.strictEqual(res.body.status, expected);
+      assert.strictEqual(res.body.modifiedBy.email, 'admin@seerr.dev');
+
+      const persisted = await repo.findOneOrFail({
+        where: { id: pending.id },
+        relations: { modifiedBy: true },
+      });
+
+      assert.strictEqual(persisted.status, expected);
+      assert.strictEqual(persisted.modifiedBy?.email, 'admin@seerr.dev');
+      assert.ok(persisted.updatedAt > pending.updatedAt);
+    });
+  }
+});
+
+describe('POST /request/:requestId/retry', () => {
+  it('re-approves a failed request and records the acting user', async () => {
+    const repo = getRepository(MediaRequest);
+    const failed = await seedRequest(MediaRequestStatus.FAILED);
+    const admin = await loginAs('admin@seerr.dev', 'test1234');
+
+    const res = await admin.post(`/request/${failed.id}/retry`);
+
+    assert.strictEqual(res.status, 200);
+    assert.strictEqual(res.body.status, MediaRequestStatus.APPROVED);
+    assert.strictEqual(res.body.modifiedBy.email, 'admin@seerr.dev');
+
+    const persisted = await repo.findOneOrFail({
+      where: { id: failed.id },
+      relations: { modifiedBy: true },
+    });
+
+    assert.strictEqual(persisted.status, MediaRequestStatus.APPROVED);
+    assert.strictEqual(persisted.modifiedBy?.email, 'admin@seerr.dev');
+    assert.ok(persisted.updatedAt > failed.updatedAt);
+  });
+});
diff --git a/server/routes/request.ts b/server/routes/request.ts
@@ -646,6 +646,7 @@ requestRoutes.post<{
 
       // this also triggers updating the parent media's status & sending to *arr
       request.status = MediaRequestStatus.APPROVED;
+      request.modifiedBy = req.user;
       await requestRepository.save(request);
 
       return res.status(200).json(request);
diff --git a/src/components/Settings/Notifications/NotificationsWebhook/index.tsx b/src/components/Settings/Notifications/NotificationsWebhook/index.tsx
@@ -37,6 +37,7 @@ const defaultPayload = {
   image: '{{image}}',
   '{{media}}': {
     media_type: '{{media_type}}',
+    imdbId: '{{media_imdbid}}',
     tmdbId: '{{media_tmdbid}}',
     tvdbId: '{{media_tvdbid}}',
     jellyfinMediaId: '{{media_jellyfinMediaId}}',
diff --git a/src/components/Settings/RadarrModal/index.tsx b/src/components/Settings/RadarrModal/index.tsx
diff --git a/src/components/Settings/SonarrModal/index.tsx b/src/components/Settings/SonarrModal/index.tsx
diff --git a/src/components/Setup/JellyfinSetup.tsx b/src/components/Setup/JellyfinSetup.tsx
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
