chore(release): 1.9.1

Merge remote-tracking branch 'origin/develop'
ci: temporarily disable snap release builds (#811 )
2025-12-24 02:39:18 -05:00 · 2024-06-12 05:52:01 +00:00 · 2024-06-12 10:49:50 +05:00 · 2024-06-12 10:49:15 +05:00 · 2024-06-12 10:38:58 +05:00 · 2024-06-12 02:56:10 +05:00
9 changed files with 132 additions and 84 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,60 +35,60 @@ jobs:
          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
        run: npx semantic-release

-  build-snap:
-    name: Build Snap Package (${{ matrix.architecture }})
-    needs: semantic-release
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        architecture:
-          - amd64
-          - arm64
-          - armhf
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Switch to main branch
-        run: git checkout main
-      - name: Pull latest changes
-        run: git pull
-      - name: Prepare
-        id: prepare
-        run: |
-          git fetch --prune --tags
-          if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
-            echo "RELEASE=stable" >> $GITHUB_OUTPUT
-          else
-            echo "RELEASE=edge" >> $GITHUB_OUTPUT
-          fi
-      - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
-      - name: Build Snap Package
-        uses: diddlesnaps/snapcraft-multiarch-action@v1
-        id: build
-        with:
-          architecture: ${{ matrix.architecture }}
-      - name: Upload Snap Package
-        uses: actions/upload-artifact@v4
-        with:
-          name: jellyseerr-snap-package-${{ matrix.architecture }}
-          path: ${{ steps.build.outputs.snap }}
-      - name: Review Snap Package
-        uses: diddlesnaps/snapcraft-review-tools-action@v1
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-      - name: Publish Snap Package
-        uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-          release: ${{ steps.prepare.outputs.RELEASE }}
+  # build-snap:
+  #   name: Build Snap Package (${{ matrix.architecture }})
+  #   needs: semantic-release
+  #   runs-on: ubuntu-22.04
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       architecture:
+  #         - amd64
+  #         - arm64
+  #         - armhf
+  #   steps:
+  #     - name: Checkout Code
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Switch to main branch
+  #       run: git checkout main
+  #     - name: Pull latest changes
+  #       run: git pull
+  #     - name: Prepare
+  #       id: prepare
+  #       run: |
+  #         git fetch --prune --tags
+  #         if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
+  #           echo "RELEASE=stable" >> $GITHUB_OUTPUT
+  #         else
+  #           echo "RELEASE=edge" >> $GITHUB_OUTPUT
+  #         fi
+  #     - name: Set Up QEMU
+  #       uses: docker/setup-qemu-action@v3
+  #       with:
+  #         image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
+  #     - name: Build Snap Package
+  #       uses: diddlesnaps/snapcraft-multiarch-action@v1
+  #       id: build
+  #       with:
+  #         architecture: ${{ matrix.architecture }}
+  #     - name: Upload Snap Package
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: jellyseerr-snap-package-${{ matrix.architecture }}
+  #         path: ${{ steps.build.outputs.snap }}
+  #     - name: Review Snap Package
+  #       uses: diddlesnaps/snapcraft-review-tools-action@v1
+  #       with:
+  #         snap: ${{ steps.build.outputs.snap }}
+  #     - name: Publish Snap Package
+  #       uses: snapcore/action-publish@v1
+  #       env:
+  #         SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
+  #       with:
+  #         snap: ${{ steps.build.outputs.snap }}
+  #         release: ${{ steps.prepare.outputs.RELEASE }}

  discord:
    name: Send Discord Notification
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [1.9.1](https://github.com/fallenbagel/jellyseerr/compare/v1.9.0...v1.9.1) (2024-06-12)
+
+
+### Bug Fixes
+
+* **api:** add DNS caching ([#810](https://github.com/fallenbagel/jellyseerr/issues/810)) ([46ee8a4](https://github.com/fallenbagel/jellyseerr/commit/46ee8a4ca13b026bd929b4027eb001cc74064bb8)), closes [#387](https://github.com/fallenbagel/jellyseerr/issues/387) [#657](https://github.com/fallenbagel/jellyseerr/issues/657) [#728](https://github.com/fallenbagel/jellyseerr/issues/728)
+* empty email in user settings ([#807](https://github.com/fallenbagel/jellyseerr/issues/807)) ([20863d4](https://github.com/fallenbagel/jellyseerr/commit/20863d4a8dabe78fb5c52995b5bcb2da557a804e)), closes [#803](https://github.com/fallenbagel/jellyseerr/issues/803)
+* **jellyfinscanner:** assign only 4k available badge for a 4k request instead of both badges ([#805](https://github.com/fallenbagel/jellyseerr/issues/805)) ([d31a2c3](https://github.com/fallenbagel/jellyseerr/commit/d31a2c37e639c1126b446277fa5d666d8102fef5))
+* remove the settings button of media when useless ([#809](https://github.com/fallenbagel/jellyseerr/issues/809)) ([f52939e](https://github.com/fallenbagel/jellyseerr/commit/f52939e4cdcbee94fc35165f613f6b3e21599e3c))
+
+
+### Reverts
+
+* Revert "ci: update format check command to ignore .prettierignore files (#787)" (#788) ([4757f1c](https://github.com/fallenbagel/jellyseerr/commit/4757f1c3e599304410a737c11f97db92a2bfcefd)), closes [#787](https://github.com/fallenbagel/jellyseerr/issues/787) [#788](https://github.com/fallenbagel/jellyseerr/issues/788)
+
 # [1.9.0](https://github.com/fallenbagel/jellyseerr/compare/v1.8.1...v1.9.0) (2024-05-29)


--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jellyseerr",
-  "version": "1.9.0",
+  "version": "1.9.1",
  "private": true,
  "scripts": {
    "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
@@ -44,6 +44,7 @@
    "axios-rate-limit": "1.3.0",
    "bcrypt": "5.1.0",
    "bowser": "2.11.0",
+    "cacheable-lookup": "^7.0.0",
    "connect-typeorm": "1.1.4",
    "cookie-parser": "1.4.6",
    "copy-to-clipboard": "3.3.3",
--- a/server/index.ts
+++ b/server/index.ts
@@ -23,6 +23,7 @@ import imageproxy from '@server/routes/imageproxy';
 import { getAppVersion } from '@server/utils/appVersion';
 import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
+import type CacheableLookupType from 'cacheable-lookup';
 import { TypeormStore } from 'connect-typeorm/out';
 import cookieParser from 'cookie-parser';
 import csurf from 'csurf';
@@ -32,10 +33,14 @@ import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
+import http from 'node:http';
+import https from 'node:https';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';

+const _importDynamic = new Function('modulePath', 'return import(modulePath)');
+
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');

 logger.info(`Starting Overseerr version ${getAppVersion()}`);
@@ -46,6 +51,12 @@ const handle = app.getRequestHandler();
 app
  .prepare()
  .then(async () => {
+    const CacheableLookup = (await _importDynamic('cacheable-lookup'))
+      .default as typeof CacheableLookupType;
+    const cacheable = new CacheableLookup();
+    cacheable.install(http.globalAgent);
+    cacheable.install(https.globalAgent);
+
    const dbConnection = await dataSource.initialize();

    // Run migrations in production
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -83,13 +83,17 @@ class JellyfinScanner {
      }

      const has4k = metadata.MediaSources?.some((MediaSource) => {
-        return MediaSource.MediaStreams.some((MediaStream) => {
+        return MediaSource.MediaStreams.filter(
+          (MediaStream) => MediaStream.Type === 'Video'
+        ).some((MediaStream) => {
          return (MediaStream.Width ?? 0) > 2000;
        });
      });

      const hasOtherResolution = metadata.MediaSources?.some((MediaSource) => {
-        return MediaSource.MediaStreams.some((MediaStream) => {
+        return MediaSource.MediaStreams.filter(
+          (MediaStream) => MediaStream.Type === 'Video'
+        ).some((MediaStream) => {
          return (MediaStream.Width ?? 0) <= 2000;
        });
      });
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -434,33 +434,38 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                </Button>
              </Tooltip>
            )}
-          {hasPermission(Permission.MANAGE_REQUESTS) && data.mediaInfo && (
-            <Tooltip content={intl.formatMessage(messages.managemovie)}>
-              <Button
-                buttonType="ghost"
-                onClick={() => setShowManager(true)}
-                className="relative ml-2 first:ml-0"
-              >
-                <CogIcon className="!mr-0" />
-                {hasPermission(
-                  [Permission.MANAGE_ISSUES, Permission.VIEW_ISSUES],
-                  {
-                    type: 'or',
-                  }
-                ) &&
-                  (
-                    data.mediaInfo?.issues.filter(
-                      (issue) => issue.status === IssueStatus.OPEN
-                    ) ?? []
-                  ).length > 0 && (
-                    <>
-                      <div className="absolute -right-1 -top-1 h-3 w-3 rounded-full bg-red-600" />
-                      <div className="absolute -right-1 -top-1 h-3 w-3 animate-ping rounded-full bg-red-600" />
-                    </>
-                  )}
-              </Button>
-            </Tooltip>
-          )}
+          {hasPermission(Permission.MANAGE_REQUESTS) &&
+            data.mediaInfo &&
+            (data.mediaInfo.jellyfinMediaId ||
+              data.mediaInfo.jellyfinMediaId4k ||
+              data.mediaInfo.status !== MediaStatus.UNKNOWN ||
+              data.mediaInfo.status4k !== MediaStatus.UNKNOWN) && (
+              <Tooltip content={intl.formatMessage(messages.managemovie)}>
+                <Button
+                  buttonType="ghost"
+                  onClick={() => setShowManager(true)}
+                  className="relative ml-2 first:ml-0"
+                >
+                  <CogIcon className="!mr-0" />
+                  {hasPermission(
+                    [Permission.MANAGE_ISSUES, Permission.VIEW_ISSUES],
+                    {
+                      type: 'or',
+                    }
+                  ) &&
+                    (
+                      data.mediaInfo?.issues.filter(
+                        (issue) => issue.status === IssueStatus.OPEN
+                      ) ?? []
+                    ).length > 0 && (
+                      <>
+                        <div className="absolute -right-1 -top-1 h-3 w-3 rounded-full bg-red-600" />
+                        <div className="absolute -right-1 -top-1 h-3 w-3 animate-ping rounded-full bg-red-600" />
+                      </>
+                    )}
+                </Button>
+              </Tooltip>
+            )}
        </div>
      </div>
      <div className="media-overview">
--- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
@@ -53,6 +53,8 @@ const messages = defineMessages({
  discordId: 'Discord User ID',
  discordIdTip:
    'The <FindDiscordIdLink>multi-digit ID number</FindDiscordIdLink> associated with your Discord user account',
+  validationemailrequired: 'Email required',
+  validationemailformat: 'Valid email required',
  validationDiscordId: 'You must provide a valid Discord user ID',
  plexwatchlistsyncmovies: 'Auto-Request Movies',
  plexwatchlistsyncmoviestip:
@@ -88,6 +90,9 @@ const UserGeneralSettings = () => {
  );

  const UserGeneralSettingsSchema = Yup.object().shape({
+    email: Yup.string()
+      .email(intl.formatMessage(messages.validationemailformat))
+      .required(intl.formatMessage(messages.validationemailrequired)),
    discordId: Yup.string()
      .nullable()
      .matches(/^\d{17,19}$/, intl.formatMessage(messages.validationDiscordId)),
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -1177,6 +1177,8 @@
  "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Settings saved successfully!",
  "components.UserProfile.UserSettings.UserGeneralSettings.user": "User",
  "components.UserProfile.UserSettings.UserGeneralSettings.validationDiscordId": "You must provide a valid Discord user ID",
+  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailformat": "Valid email required",
+  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailrequired": "Email required",
  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Device Default",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordId": "User ID",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordIdTip": "The <FindDiscordIdLink>multi-digit ID number</FindDiscordIdLink> associated with your user account",
--- a/yarn.lock
+++ b/yarn.lock
@@ -5033,6 +5033,11 @@ cacache@^16.0.0, cacache@^16.1.0, cacache@^16.1.3:
    tar "^6.1.11"
    unique-filename "^2.0.0"

+cacheable-lookup@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz#3476a8215d046e5a3202a9209dd13fec1f933a27"
+  integrity sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==
+
 cachedir@2.3.0, cachedir@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
Author	SHA1	Message	Date
semantic-release-bot	f735d86064	chore(release): 1.9.1	2024-06-12 05:52:01 +00:00
fallenbagel	66c5de2bfa	Merge remote-tracking branch 'origin/develop'	2024-06-12 10:49:50 +05:00
Fallenbagel	6eb88f8674	ci: temporarily disable snap release builds (#811 )	2024-06-12 10:49:15 +05:00
fallenbagel	6cf1ac7295	Merge remote-tracking branch 'origin/develop'	2024-06-12 10:38:58 +05:00
Gauthier	46ee8a4ca1	fix(api): add DNS caching (#810 ) fix #387 #657 #728	2024-06-12 02:56:10 +05:00
Gauthier	f52939e4cd	fix: remove the settings button of media when useless (#809 ) After the Media Availability Sync job rund on deleted media, the setting button is still visible even if neither the media file nor the media request no longer exists. This PR hides this button when it's no longer the case	2024-06-11 19:47:02 +05:00
Gauthier	d31a2c37e6	fix(jellyfinscanner): assign only 4k available badge for a 4k request instead of both badges (#805 ) When you have a 4k server setup, and request a 4k item, when it becomes available it also sets the normal item as available thus not allowing the user to request for the normal item	2024-06-11 17:58:48 +05:00
Gauthier	20863d4a8d	fix: empty email in user settings (#807 ) Email is mandatory for every user and required during the setup of Jellyseerr, but it is possible to set it empty afterwards in the user settings. When the email is empty, users are not able to connect to Jellyseer. This PR makes the email field mandatory in the user settings. fix #803	2024-06-11 16:23:35 +05:00
Fallenbagel	4757f1c3e5	Revert "ci: update format check command to ignore .prettierignore files (#787 )" (#788 ) This reverts commit `1f1ad72e9e`.	2024-06-01 06:10:07 +05:00
Fallenbagel	1f1ad72e9e	ci: update format check command to ignore .prettierignore files (#787 ) This is to try and fix formatting issues on #773 on a file that should be ignored.	2024-06-01 05:52:14 +05:00