fix: add more logs to debug discord notifications

chore: update to pnpm v10
fix: resolve a vulnerability with admin token (#1345 )
2025-12-24 02:39:18 -05:00 · 2025-02-10 21:59:17 +01:00 · 2025-02-10 21:56:33 +01:00 · 2025-02-10 00:17:11 +01:00 · 2025-02-09 01:12:54 +08:00 · 2025-02-08 02:23:37 +08:00
28 changed files with 265 additions and 169 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -592,6 +592,15 @@
      "contributions": [
        "infra"
      ]
+    },
+    {
+      "login": "andrewkolda",
+      "name": "andrewkolda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/158614532?v=4",
+      "profile": "https://github.com/andrewkolda",
+      "contributions": [
+        "design"
+      ]
    }
  ]
 }
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
  test:
    name: Lint & Test Build
    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    container: node:22-alpine
    steps:
      - name: Checkout
@@ -20,7 +20,7 @@ jobs:
      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
-          version: 9
+          version: 10
      - name: Get pnpm store directory
        shell: sh
        run: |
@@ -43,15 +43,23 @@ jobs:
      - name: Build
        run: pnpm build

-  build_and_push:
+  build:
    name: Build & Publish Docker Images
    if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-24.04
+            platform: linux/amd64
+          - runner: ubuntu-24.04-arm
+            platform: linux/arm64
+    runs-on: ${{ matrix.runner }}
+    outputs:
+      digest-amd64: ${{ steps.set_outputs.outputs.digest-amd64 }}
+      digest-arm64: ${{ steps.set_outputs.outputs.digest-arm64 }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Log in to Docker Hub
@@ -70,24 +78,77 @@ jobs:
          echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
        env:
          OWNER: ${{ github.repository_owner }}
-      - name: Build and push
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            fallenbagel/jellyseerr
+            ghcr.io/${{ env.OWNER_LC }}/jellyseerr
+          tags: |
+            type=ref,event=branch
+            type=sha,prefix=,suffix=,format=short
+      - name: Build and push by digest
+        id: build
        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platform }}
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
-          tags: |
-            fallenbagel/jellyseerr:develop
-            ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop
+          outputs: |
+            type=image,push-by-digest=true,name=fallenbagel/jellyseerr,push=true
+            type=image,push-by-digest=true,name=ghcr.io/${{ env.OWNER_LC }}/jellyseerr,push=true
+          cache-from: type=gha,scope=${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
+          provenance: false
+      - name: Set outputs
+        id: set_outputs
+        run: |
+          platform="${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}"
+          echo "digest-${platform}=${{ steps.build.outputs.digest }}" >> $GITHUB_OUTPUT
+
+  merge_and_push:
+    name: Create and Push Multi-arch Manifest
+    needs: build
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set lower case owner name
+        run: |
+          echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
+        env:
+          OWNER: ${{ github.repository_owner }}
+      - name: Create and push manifest
+        run: |
+          docker manifest create fallenbagel/jellyseerr:develop \
+            --amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \
+            --amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-arm64 }}
+          docker manifest push fallenbagel/jellyseerr:develop
+
+          # GHCR manifest
+          docker manifest create ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop \
+            --amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \
+            --amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-arm64 }}
+          docker manifest push ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop

  discord:
    name: Send Discord Notification
-    needs: build_and_push
+    needs: merge_and_push
    if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    steps:
      - name: Get Build Job Status
        uses: technote-space/workflow-conclusion-action@v3
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -21,7 +21,7 @@ jobs:
      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
-          version: 9
+          version: 10
      - name: Cypress run
        uses: cypress-io/github-action@v6
        with:
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -25,7 +25,7 @@ jobs:
      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
-          version: 9
+          version: 10

      - name: Get pnpm store directory
        shell: sh
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -12,6 +12,10 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+      - name: Pnpm Setup
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
      - name: Get the version
        id: get_version
        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
-          version: 9
+          version: 10
      - name: Get pnpm store directory
        shell: sh
        run: |
--- a/.github/workflows/test-docs-deploy.yml
+++ b/.github/workflows/test-docs-deploy.yml
@@ -25,7 +25,7 @@ jobs:
      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
-          version: 9
+          version: 10

      - name: Get pnpm store directory
        shell: sh
@@ -42,7 +42,7 @@ jobs:

      - name: Install dependencies
        run: |
-          cd gen-docs 
+          cd gen-docs
          pnpm install --frozen-lockfile

      - name: Build website
--- a/2
+++ b/2
@@ -29,7 +29,7 @@ RUN pnpm build
 # remove development dependencies
 RUN pnpm prune --prod --ignore-scripts

-RUN rm -rf src server .next/cache
+RUN rm -rf src server .next/cache charts gen-docs docs

 RUN touch config/DOCKER

--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 <a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-64-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-65-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 **Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.
@@ -168,6 +168,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
    </tr>
    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/methbkts"><img src="https://avatars.githubusercontent.com/u/30674934?v=4?s=100" width="100px;" alt="Metin Bektas"/><br /><sub><b>Metin Bektas</b></sub></a><br /><a href="#infra-methbkts" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrewkolda"><img src="https://avatars.githubusercontent.com/u/158614532?v=4?s=100" width="100px;" alt="andrewkolda"/><br /><sub><b>andrewkolda</b></sub></a><br /><a href="#design-andrewkolda" title="Design">🎨</a></td>
    </tr>
  </tbody>
 </table>
--- a/charts/jellyseerr-chart/Chart.yaml
+++ b/charts/jellyseerr-chart/Chart.yaml
@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
 name: jellyseerr-chart
 description: Jellyseerr helm chart for Kubernetes
 type: application
-version: 1.3.0
-appVersion: "2.2.3"
+version: 2.1.1
+appVersion: "2.3.0"
 maintainers:
  - name: Jellyseerr
    url: https://github.com/Fallenbagel/jellyseerr
--- a/charts/jellyseerr-chart/README.md
+++ b/charts/jellyseerr-chart/README.md
@@ -1,6 +1,6 @@
 # jellyseerr-chart

-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
+![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)

 Jellyseerr helm chart for Kubernetes

@@ -25,10 +25,6 @@ Kubernetes: `>=1.23.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
-| autoscaling.enabled | bool | `false` |  |
-| autoscaling.maxReplicas | int | `100` |  |
-| autoscaling.minReplicas | int | `1` |  |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | config | object | `{"persistence":{"accessModes":["ReadWriteOnce"],"annotations":{},"name":"","size":"5Gi","volumeName":""}}` | Creating PVC to store configuration |
 | config.persistence.accessModes | list | `["ReadWriteOnce"]` | Access modes of persistent disk |
 | config.persistence.annotations | object | `{}` | Annotations for PVCs |
@@ -39,7 +35,7 @@ Kubernetes: `>=1.23.0-0`
 | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the jellyseerr pods |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.registry | string | `"docker.io"` |  |
+| image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"fallenbagel/jellyseerr"` |  |
 | image.sha | string | `""` |  |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
@@ -67,3 +63,5 @@ Kubernetes: `>=1.23.0-0`
 | serviceAccount.name | string | `""` | If not set and create is true, a name is generated using the fullname template |
 | strategy | object | `{"type":"Recreate"}` | Deployment strategy |
 | tolerations | list | `[]` |  |
+| volumeMounts | list | `[]` | Additional volumeMounts on the output Deployment definition. |
+| volumes | list | `[]` | Additional volumes on the output Deployment definition. |
--- a/charts/jellyseerr-chart/templates/deployment.yaml
+++ b/charts/jellyseerr-chart/templates/deployment.yaml
@@ -5,9 +5,7 @@ metadata:
  labels:
    {{- include "jellyseerr.labels" . | nindent 4 }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
  replicas: {{ .Values.replicaCount }}
-  {{- end }}
  strategy:
    type: {{ .Values.strategy.type }}
  selector:
@@ -67,10 +65,16 @@ spec:
          volumeMounts:
            - name: config
              mountPath: /app/config
+          {{- with .Values.volumeMounts }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
      volumes:
        - name: config
          persistentVolumeClaim:
            claimName: {{ include "jellyseerr.configPersistenceName" . }}
+      {{- with .Values.volumes }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      {{- with .Values.nodeSelector }}
      nodeSelector:
        {{- toYaml . | nindent 8 }}
--- a/charts/jellyseerr-chart/templates/hpa.yaml
+++ b/charts/jellyseerr-chart/templates/hpa.yaml
@@ -1,32 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "jellyseerr.fullname" . }}
-  labels:
-    {{- include "jellyseerr.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "jellyseerr.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
--- a/charts/jellyseerr-chart/values.yaml
+++ b/charts/jellyseerr-chart/values.yaml
@@ -1,7 +1,7 @@
 replicaCount: 1

 image:
-  registry: docker.io
+  registry: ghcr.io
  repository: fallenbagel/jellyseerr
  pullPolicy: IfNotPresent
  # -- Overrides the image tag whose default is the chart appVersion.
@@ -94,12 +94,18 @@ resources: {}
  #   cpu: 100m
  #   memory: 128Mi

-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
+# -- Additional volumes on the output Deployment definition.
+volumes: []
+# - name: foo
+#   secret:
+#     secretName: mysecret
+#     optional: false
+
+# -- Additional volumeMounts on the output Deployment definition.
+volumeMounts: []
+# - name: foo
+#   mountPath: "/etc/foo"
+#   readOnly: true

 nodeSelector: {}

--- a/docs/getting-started/buildfromsource.mdx
+++ b/docs/getting-started/buildfromsource.mdx
@@ -15,7 +15,7 @@ import TabItem from '@theme/TabItem';

 ### Prerequisites
    - [Node.js 22.x](https://nodejs.org/en/download/)
-    - [Pnpm 9.x](https://pnpm.io/installation)
+    - [Pnpm 10.x](https://pnpm.io/installation)
    - [Git](https://git-scm.com/downloads)

 ## Unix (Linux, macOS)
--- a/gen-docs/docusaurus.config.ts
+++ b/gen-docs/docusaurus.config.ts
@@ -11,7 +11,7 @@ const config: Config = {
  baseUrl: '/',
  trailingSlash: false,

-  organizationName: 'Fallenbagel',
+  organizationName: 'fallenbagel',
  projectName: 'Jellyseerr',
  deploymentBranch: 'gh-pages',

@@ -32,7 +32,7 @@ const config: Config = {
          routeBasePath: '/',
          path: '../docs',
          editUrl:
-            'https://github.com/Fallenbagel/jellyseerr/edit/develop/docs/',
+            'https://github.com/fallenbagel/jellyseerr/edit/develop/docs/',
        },
        blog: false,
        pages: false,
@@ -70,7 +70,7 @@ const config: Config = {
      },
      items: [
        {
-          href: 'https://github.com/Fallenbagel/jellyseerr',
+          href: 'https://github.com/fallenbagel/jellyseerr',
          label: 'GitHub',
          position: 'right',
        },
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
    "@supercharge/request-ip": "1.2.0",
    "@svgr/webpack": "6.5.1",
    "@tanem/react-nprogress": "5.0.30",
+    "@types/wink-jaro-distance": "^2.0.2",
    "ace-builds": "1.15.2",
    "bcrypt": "5.1.0",
    "bowser": "2.11.0",
@@ -97,6 +98,7 @@
    "typeorm": "0.3.11",
    "undici": "^6.20.1",
    "web-push": "3.5.0",
+    "wink-jaro-distance": "^2.0.0",
    "winston": "3.8.2",
    "winston-daily-rotate-file": "4.7.1",
    "xml2js": "0.4.23",
@@ -170,7 +172,7 @@
  },
  "engines": {
    "node": "^22.0.0",
-    "pnpm": "^9.0.0"
+    "pnpm": "^10.0.0"
  },
  "overrides": {
    "sqlite3/node-gyp": "8.4.1",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,6 +38,9 @@ importers:
      '@tanem/react-nprogress':
        specifier: 5.0.30
        version: 5.0.30(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@types/wink-jaro-distance':
+        specifier: ^2.0.2
+        version: 2.0.2
      ace-builds:
        specifier: 1.15.2
        version: 1.15.2
@@ -203,6 +206,9 @@ importers:
      web-push:
        specifier: 3.5.0
        version: 3.5.0
+      wink-jaro-distance:
+        specifier: ^2.0.0
+        version: 2.0.0
      winston:
        specifier: 3.8.2
        version: 3.8.2
@@ -3250,6 +3256,9 @@ packages:
  '@types/webxr@0.5.20':
    resolution: {integrity: sha512-JGpU6qiIJQKUuVSKx1GtQnHJGxRjtfGIhzO2ilq43VZZS//f1h1Sgexbdk+Lq+7569a6EYhOWrUpIruR/1Enmg==}

+  '@types/wink-jaro-distance@2.0.2':
+    resolution: {integrity: sha512-Q79orp7qA/g/uLdFmqd5MtEa0ZfJW5X1WXikAu8IVHt24IrHWrcTNYNdPpLK5mwVg34C6FQnrv/DMtcUhjE/zA==}
+
  '@types/xml2js@0.4.11':
    resolution: {integrity: sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==}

@@ -9467,6 +9476,9 @@ packages:
  wide-align@1.1.5:
    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}

+  wink-jaro-distance@2.0.0:
+    resolution: {integrity: sha512-9bcUaXCi9N8iYpGWbFkf83OsBkg17r4hEyxusEzl+nnReLRPqxhB9YNeRn3g54SYnVRNXP029lY3HDsbdxTAuA==}
+
  winston-daily-rotate-file@4.7.1:
    resolution: {integrity: sha512-7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA==}
    engines: {node: '>=8'}
@@ -13737,6 +13749,8 @@ snapshots:

  '@types/webxr@0.5.20': {}

+  '@types/wink-jaro-distance@2.0.2': {}
+
  '@types/xml2js@0.4.11':
    dependencies:
      '@types/node': 22.10.5
@@ -20905,6 +20919,8 @@ snapshots:
    dependencies:
      string-width: 4.2.3

+  wink-jaro-distance@2.0.0: {}
+
  winston-daily-rotate-file@4.7.1(winston@3.8.2):
    dependencies:
      file-stream-rotator: 0.6.1
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
--- a/server/api/rating/rottentomatoes.ts
+++ b/server/api/rating/rottentomatoes.ts
@@ -1,6 +1,7 @@
 import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
+import jaro from 'wink-jaro-distance';

 interface RTAlgoliaSearchResponse {
  results: {
@@ -15,7 +16,7 @@ interface RTAlgoliaHit {
  tmsId: string;
  type: string;
  title: string;
-  titles: string[];
+  titles?: string[];
  description: string;
  releaseYear: number;
  rating: string;
@@ -24,9 +25,9 @@ interface RTAlgoliaHit {
  isEmsSearchable: boolean;
  rtId: number;
  vanity: string;
-  aka: string[];
+  aka?: string[];
  posterImageUrl: string;
-  rottenTomatoes: {
+  rottenTomatoes?: {
    audienceScore: number;
    criticsIconUrl: string;
    wantToSeeCount: number;
@@ -47,6 +48,47 @@ export interface RTRating {
  url: string;
 }

+// Tunables
+const INEXACT_TITLE_FACTOR = 0.25;
+const ALTERNATE_TITLE_FACTOR = 0.8;
+const PER_YEAR_PENALTY = 0.4;
+const MINIMUM_SCORE = 0.175;
+
+// Normalization for title comparisons.
+// Lowercase and strip non-alphanumeric (unicode-aware).
+const norm = (s: string): string =>
+  s.toLowerCase().replace(/[^\p{L}\p{N} ]/gu, '');
+
+// Title similarity. 1 if exact, quarter-jaro otherwise.
+const similarity = (a: string, b: string): number =>
+  a === b ? 1 : jaro(a, b).similarity * INEXACT_TITLE_FACTOR;
+
+// Gets the best similarity score between the searched title and all alternate
+// titles of the search result. Non-main titles are penalized.
+const t_score = ({ title, titles, aka }: RTAlgoliaHit, s: string): number => {
+  const f = (t: string, i: number) =>
+    similarity(norm(t), norm(s)) * (i ? ALTERNATE_TITLE_FACTOR : 1);
+  return Math.max(...[title].concat(aka || [], titles || []).map(f));
+};
+
+// Year difference to score: 0 -> 1.0, 1 -> 0.6, 2 -> 0.2, 3+ -> 0.0
+const y_score = (r: RTAlgoliaHit, y?: number): number =>
+  y ? Math.max(0, 1 - Math.abs(r.releaseYear - y) * PER_YEAR_PENALTY) : 1;
+
+// Cut score in half if result has no ratings.
+const extra_score = (r: RTAlgoliaHit): number => (r.rottenTomatoes ? 1 : 0.5);
+
+// Score search result as product of all subscores
+const score = (r: RTAlgoliaHit, name: string, year?: number): number =>
+  t_score(r, name) * y_score(r, year) * extra_score(r);
+
+// Score each search result and return the highest scoring result, if any
+const best = (rs: RTAlgoliaHit[], name: string, year?: number): RTAlgoliaHit =>
+  rs
+    .map((r) => ({ score: score(r, name, year), result: r }))
+    .filter(({ score }) => score > MINIMUM_SCORE)
+    .sort(({ score: a }, { score: b }) => b - a)[0]?.result;
+
 /**
 * This is a best-effort API. The Rotten Tomatoes API is technically
 * private and getting access costs money/requires approval.
@@ -90,47 +132,21 @@ class RottenTomatoes extends ExternalAPI {
    year: number
  ): Promise<RTRating | null> {
    try {
+      const filters = encodeURIComponent('isEmsSearchable=1 AND type:"movie"');
      const data = await this.post<RTAlgoliaSearchResponse>('/queries', {
        requests: [
          {
            indexName: 'content_rt',
-            query: name,
-            params: 'filters=isEmsSearchable%20%3D%201&hitsPerPage=20',
+            query: name.replace(/\bthe\b ?/gi, ''),
+            params: `filters=${filters}&hitsPerPage=20`,
          },
        ],
      });

      const contentResults = data.results.find((r) => r.index === 'content_rt');
+      const movie = best(contentResults?.hits || [], name, year);

-      if (!contentResults) {
-        return null;
-      }
-
-      // First, attempt to match exact name and year
-      let movie = contentResults.hits.find(
-        (movie) => movie.releaseYear === year && movie.title === name
-      );
-
-      // If we don't find a movie, try to match partial name and year
-      if (!movie) {
-        movie = contentResults.hits.find(
-          (movie) => movie.releaseYear === year && movie.title.includes(name)
-        );
-      }
-
-      // If we still dont find a movie, try to match just on year
-      if (!movie) {
-        movie = contentResults.hits.find((movie) => movie.releaseYear === year);
-      }
-
-      // One last try, try exact name match only
-      if (!movie) {
-        movie = contentResults.hits.find((movie) => movie.title === name);
-      }
-
-      if (!movie?.rottenTomatoes) {
-        return null;
-      }
+      if (!movie?.rottenTomatoes) return null;

      return {
        title: movie.title,
@@ -158,33 +174,21 @@ class RottenTomatoes extends ExternalAPI {
    year?: number
  ): Promise<RTRating | null> {
    try {
+      const filters = encodeURIComponent('isEmsSearchable=1 AND type:"tv"');
      const data = await this.post<RTAlgoliaSearchResponse>('/queries', {
        requests: [
          {
            indexName: 'content_rt',
            query: name,
-            params: 'filters=isEmsSearchable%20%3D%201&hitsPerPage=20',
+            params: `filters=${filters}&hitsPerPage=20`,
          },
        ],
      });

      const contentResults = data.results.find((r) => r.index === 'content_rt');
+      const tvshow = best(contentResults?.hits || [], name, year);

-      if (!contentResults) {
-        return null;
-      }
-
-      let tvshow: RTAlgoliaHit | undefined = contentResults.hits[0];
-
-      if (year) {
-        tvshow = contentResults.hits.find(
-          (series) => series.releaseYear === year
-        );
-      }
-
-      if (!tvshow || !tvshow.rottenTomatoes) {
-        return null;
-      }
+      if (!tvshow?.rottenTomatoes) return null;

      return {
        title: tvshow.title,
--- a/server/entity/User.ts
+++ b/server/entity/User.ts
@@ -83,13 +83,13 @@ export class User {
  @Column({ nullable: true })
  public jellyfinUserId?: string;

-  @Column({ nullable: true })
+  @Column({ nullable: true, select: false })
  public jellyfinDeviceId?: string;

-  @Column({ nullable: true })
+  @Column({ nullable: true, select: false })
  public jellyfinAuthToken?: string;

-  @Column({ nullable: true })
+  @Column({ nullable: true, select: false })
  public plexToken?: string;

  @Column({ type: 'integer', default: 0 })
--- a/server/job/schedule.ts
+++ b/server/job/schedule.ts
@@ -70,6 +70,35 @@ export const startJobs = (): void => {
      running: () => plexFullScanner.status().running,
      cancelFn: () => plexFullScanner.cancel(),
    });
+
+    scheduledJobs.push({
+      id: 'plex-refresh-token',
+      name: 'Plex Refresh Token',
+      type: 'process',
+      interval: 'fixed',
+      cronSchedule: jobs['plex-refresh-token'].schedule,
+      job: schedule.scheduleJob(jobs['plex-refresh-token'].schedule, () => {
+        logger.info('Starting scheduled job: Plex Refresh Token', {
+          label: 'Jobs',
+        });
+        refreshToken.run();
+      }),
+    });
+
+    // Watchlist Sync
+    scheduledJobs.push({
+      id: 'plex-watchlist-sync',
+      name: 'Plex Watchlist Sync',
+      type: 'process',
+      interval: 'seconds',
+      cronSchedule: jobs['plex-watchlist-sync'].schedule,
+      job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
+        logger.info('Starting scheduled job: Plex Watchlist Sync', {
+          label: 'Jobs',
+        });
+        watchlistSync.syncWatchlist();
+      }),
+    });
  } else if (
    mediaServerType === MediaServerType.JELLYFIN ||
    mediaServerType === MediaServerType.EMBY
@@ -112,21 +141,6 @@ export const startJobs = (): void => {
    });
  }

-  // Watchlist Sync
-  scheduledJobs.push({
-    id: 'plex-watchlist-sync',
-    name: 'Plex Watchlist Sync',
-    type: 'process',
-    interval: 'seconds',
-    cronSchedule: jobs['plex-watchlist-sync'].schedule,
-    job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
-      logger.info('Starting scheduled job: Plex Watchlist Sync', {
-        label: 'Jobs',
-      });
-      watchlistSync.syncWatchlist();
-    }),
-  });
-
  // Run full radarr scan every 24 hours
  scheduledJobs.push({
    id: 'radarr-scan',
@@ -223,19 +237,5 @@ export const startJobs = (): void => {
    }),
  });

-  scheduledJobs.push({
-    id: 'plex-refresh-token',
-    name: 'Plex Refresh Token',
-    type: 'process',
-    interval: 'fixed',
-    cronSchedule: jobs['plex-refresh-token'].schedule,
-    job: schedule.scheduleJob(jobs['plex-refresh-token'].schedule, () => {
-      logger.info('Starting scheduled job: Plex Refresh Token', {
-        label: 'Jobs',
-      });
-      refreshToken.run();
-    }),
-  });
-
  logger.info('Scheduled jobs loaded', { label: 'Jobs' });
 };
--- a/server/lib/notifications/agents/discord.ts
+++ b/server/lib/notifications/agents/discord.ts
@@ -295,6 +295,14 @@ class DiscordAgent
        userMentions.push(`<@&${settings.options.webhookRoleId}>`);
      }

+      logger.debug('Discord notification details', {
+        username: settings.options.botUsername
+          ? settings.options.botUsername
+          : getSettings().main.applicationTitle,
+        avatar_url: settings.options.botAvatarUrl,
+        embeds: [this.buildEmbed(type, payload)],
+        content: userMentions.join(' '),
+      });
      const response = await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: {
@@ -310,6 +318,12 @@ class DiscordAgent
        } as DiscordWebhookPayload),
      });
      if (!response.ok) {
+        logger.debug('Error sending Discord notification, response not ok', {
+          label: 'Notifications',
+          type: Notification[type],
+          subject: payload.subject,
+          response: response.statusText,
+        });
        throw new Error(response.statusText, { cause: response });
      }

@@ -328,6 +342,7 @@ class DiscordAgent
        subject: payload.subject,
        errorMessage: e.message,
        response: errorData,
+        stack: e.stack,
      });

      return false;
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -263,6 +263,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    // Try to find deviceId that corresponds to jellyfin user, else generate a new one
    let user = await userRepository.findOne({
      where: { jellyfinUsername: body.username },
+      select: { id: true, jellyfinDeviceId: true },
    });

    let deviceId = '';
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -38,14 +38,14 @@ import {
  ExclamationTriangleIcon,
  EyeSlashIcon,
  FilmIcon,
+  MinusCircleIcon,
  PlayIcon,
+  StarIcon,
  TicketIcon,
 } from '@heroicons/react/24/outline';
 import {
  ChevronDoubleDownIcon,
  ChevronDoubleUpIcon,
-  MinusCircleIcon,
-  StarIcon,
 } from '@heroicons/react/24/solid';
 import { type RatingResponse } from '@server/api/ratings';
 import { IssueStatus } from '@server/constants/issue';
--- a/src/components/Setup/index.tsx
+++ b/src/components/Setup/index.tsx
@@ -133,10 +133,6 @@ const Setup = () => {
        setCurrentStep(3);
      }
    }
-
-    if (currentStep === 3) {
-      validateLibraries();
-    }
  }, [
    settings.currentSettings.mediaServerType,
    settings.currentSettings.initialized,
@@ -148,6 +144,13 @@ const Setup = () => {
    validateLibraries,
  ]);

+  useEffect(() => {
+    if (currentStep === 3) {
+      validateLibraries();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [currentStep]);
+
  const handleComplete = () => {
    validateLibraries();
  };
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -41,13 +41,11 @@ import {
  ExclamationTriangleIcon,
  EyeSlashIcon,
  FilmIcon,
-  PlayIcon,
-} from '@heroicons/react/24/outline';
-import {
-  ChevronDownIcon,
  MinusCircleIcon,
+  PlayIcon,
  StarIcon,
-} from '@heroicons/react/24/solid';
+} from '@heroicons/react/24/outline';
+import { ChevronDownIcon } from '@heroicons/react/24/solid';
 import type { RTRating } from '@server/api/rating/rottentomatoes';
 import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { IssueStatus } from '@server/constants/issue';
--- a/src/components/UserList/BulkEditModal.tsx
+++ b/src/components/UserList/BulkEditModal.tsx
@@ -1,9 +1,10 @@
 import Modal from '@app/components/Common/Modal';
 import PermissionEdit from '@app/components/PermissionEdit';
 import type { User } from '@app/hooks/useUser';
-import { useUser } from '@app/hooks/useUser';
+import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { hasPermission } from '@server/lib/permissions';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -79,7 +80,10 @@ const BulkEditModal = ({
      const { permissions: allPermissionsEqual } = selectedUsers.reduce(
        ({ permissions: aPerms }, { permissions: bPerms }) => {
          return {
-            permissions: aPerms === bPerms ? aPerms : NaN,
+            permissions:
+              aPerms === bPerms || hasPermission(Permission.ADMIN, aPerms)
+                ? aPerms
+                : NaN,
          };
        },
        { permissions: selectedUsers[0].permissions }
Author	SHA1	Message	Date
gauthier-th	99c06f1158	fix: add more logs to debug discord notifications	2025-02-10 21:59:17 +01:00
gauthier-th	ffe5154ca0	chore: update to pnpm v10	2025-02-10 21:56:33 +01:00
Gauthier	620135aeac	fix: resolve a vulnerability with admin token (#1345 ) By default, the jellyfinAuthToken of every user was always retrieved from the database, and sometimes sent back to the client. Any logged-in user could retrieve this token via a request containing admin user information, and use it to gain full access to Jellyfin. This PR removes the auth token and the device ID from the fields selected by default by TypeORM.	2025-02-10 00:17:11 +01:00
Gauthier	2dbd1096d2	fix: disallow admins to edit other admins in bulk edit (#1340 ) This PR fixes a bug where admin users could edit the permissions of other admins in the bulk edit modal. fix #1309	2025-02-09 01:12:54 +08:00
Gauthier	24d3f523fc	feat: add a robots.txt file (#1335 ) This PR adds a `robots.txt` file to prevent crawlers to index the website re #1323	2025-02-08 02:23:37 +08:00
Gauthier	2b7974fa06	fix(jobs): run plex/jellyfin jobs only for the relevant media server (#1331 ) Due to merging issues with upstream, some jobs for the Plex media server where also running on Jellyfin/Emby instances. This PR makes them run only when the media server is Plex. fix #1329	2025-02-05 05:01:02 +08:00
Ben Haney	907ba6fdea	feat(api): make rottentomatoes matching more robust (#1265 )	2025-01-31 23:04:34 +08:00
fallenbagel	efaad21554	build: remove unnecessary files from final docker image (#1314 ) * build: remove charts from final docker image fix #1313 * build: remove docs too	2025-01-30 19:48:16 +08:00
Gauthier	6ab463285d	fix(setup): resolve looping library validation error message (#1316 ) This PR fixes a bug where the validation error message is displayed over and over because of a React useEffect dependency issue. Previously, the `validateLibraries()` function was being called inside a useEffect that depended on a state that this function was updating.	2025-01-30 11:22:23 +01:00
Ludovic Ortega	418f0c2eb8	fix(helm): no change, fixing OCI manifest corruption (#1310 ) Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>	2025-01-27 15:49:24 +01:00
fallenbagel	002557d2d0	docs: changed the name to lowercase (#1296 )	2025-01-21 17:20:33 +08:00
Ludovic Ortega	62c1a70b37	feat(helm): Add possibility to pass volumes and volume mounts (#1291 ) Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>	2025-01-20 20:20:27 +08:00
allcontributors[bot]	1b325e7c32	docs: add andrewkolda as a contributor for design (#1293 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2025-01-20 06:41:25 +08:00
andrewkolda	f247642b76	fix: make watchlist buttons consistent (#1272 ) fix #1270 Co-authored-by: andrewkolda <git@kolda.me>	2025-01-19 23:15:54 +01:00
Fallenbagel	396cd968ef	ci: push individual arch digest only and merge from digest (#1284 ) * ci: push individual arch digest only and merge from digest * ci: correct syntax for docker manifest * ci: add the missing id to the build step * ci: set proper ids and output digest that is dependant on matrix.id * ci: proper dynamic outputs by manually echoing it out * ci: remove unnecessary test step	2025-01-19 03:41:25 +08:00
fallenbagel	ca739315b2	ci: remove cleanup steps since docker registry v2 doesnt support it	2025-01-18 22:28:58 +08:00
fallenbagel	9143a6c027	ci: push temp tags and create multi-arch from them and cleanup	2025-01-18 22:19:39 +08:00
fallenbagel	d7fc03650f	ci: use direct docker manifest command to create and push manifest	2025-01-18 21:54:09 +08:00
fallenbagel	80fc5c1a78	ci: better manifest merging to only push final multi-arch manifest	2025-01-18 21:43:14 +08:00
fallenbagel	95737d36e6	ci: fix typo in create_manifest	2025-01-18 20:59:29 +08:00
fallenbagel	0fd6ca85a4	ci: fix missing version for create_manifest & discord notification after create_manifest	2025-01-18 20:53:09 +08:00
fallenbagel	7cee9b475d	ci: fix multi-arch image creation workflow use int128/docker-manifest-create-action to combine the images	2025-01-18 20:50:22 +08:00
fallenbagel	ff9af866f8	ci: use the proper action to merge manifests & pass in lowercase owner	2025-01-18 20:40:03 +08:00
fallenbagel	5ffe6419ee	ci: remove sanitisation and hardcode platform tag depending on platform	2025-01-18 20:31:18 +08:00
fallenbagel	8afcf5a8d8	ci: attempt to sanitise the platfom and add to gh env	2025-01-18 20:25:06 +08:00
Fallenbagel	17d93a8cb9	ci: fix typo when passing sanitised platform to github env (#1282 ) * ci: fix typo when passing sanitised platform to github env * ci: hardcode a platform & owner for testing sanitation * ci: fix typo * ci: fix typo * ci: fix yet another typo * ci: fix yet another typo * ci: another typo when echoing the tested variables fixed * ci: properly echo the values from github env * ci: attempt to echo out the sanitised variables * ci: finalise the sanitation test and remove it from lint & test build	2025-01-18 20:23:03 +08:00
Fallenbagel	549082c53e	ci: fix typo when sanitising platform (#1281 )	2025-01-18 19:55:36 +08:00
Fallenbagel	fbef7e2c72	ci: seperate job to pass in sanitised platform (#1280 ) This is done as github actions doesnt support inline replacement that was done on #1279	2025-01-18 19:49:58 +08:00
Fallenbagel	93d2e26ae9	ci: sanitise container tag (#1279 ) * ci: sanitise container tag Tags cant container `/` so this should sanitise them * ci: use simple case owner name	2025-01-18 19:42:05 +08:00
Fallenbagel	f09a432635	ci: add a job to merge and create multi-arch image (#1278 ) This has to be done now that arm64 and amd64 runs as two seperate jobs. Otherwise, whichever finishes the last would override the other one when pushed	2025-01-18 19:34:36 +08:00
Fallenbagel	a8f84d4f74	ci: correct arm runner label (#1277 ) The issue was all because of using the wrong label. 18 hours wasted waiting for a non-existent runner to start. It is `ubuntu-24.04-arm` https://github.com/orgs/community/discussions/148648#discussion-7793082	2025-01-18 19:07:45 +08:00
Fallenbagel	88e96fa163	ci: upgrade runner to ubuntu 24.04 to get arm64 runner working (#1276 ) This is another attempt to get arm64 runner working by upgrading the runner to ubuntu-24-04, hoping it works better. Related to #1275	2025-01-18 17:57:07 +08:00
Fallenbagel	2d814c1416	ci: attempt to fix arm64 runners with proper scoped caching (#1275 ) Added platform specific cache scoping and turned off provenance to prevent manifest merging. In addition we are now using ubuntu24.04 in an attempt to get the job to run as ubuntu-22.04 were stalled for more than 18 hours.	2025-01-18 17:49:35 +08:00
Fallenbagel	2f4b848b2c	ci: utilise the linux arm64 hosted runners (#1271 ) * ci: utilise the linux arm64 hosted runners This is an attempt to utilise the linux arm64 hosted runners which should reduce the build times significantly. In addition, this should leverage the github's built-in caching. * ci: fix typo	2025-01-18 05:14:33 +08:00
Ludovic Ortega	0ee3e69a61	feat: upgrade chart to 2.0.0 (#1268 ) - upgrade jellyseerr to 2.3.0 - disable HPA as it's not documented and not useful - migrate container image to ghcr.io registry Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>	2025-01-17 18:32:20 +08:00