fix: type declarations for csurf

This reverts csrf-csrf change brought on by `9e3119` in #1393 back to `csurf` that is maintained

.github/workflows/cypress.yml

@@ -37,7 +37,6 @@ jobs:
           COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
           COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
       - name: Upload video files
-        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: cypress-videos

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: 2.2.0
-appVersion: "2.4.0"
+version: 2.1.1
+appVersion: "2.3.0"
 maintainers:
   - name: Jellyseerr
     url: https://github.com/Fallenbagel/jellyseerr

charts/jellyseerr-chart/README.md

@@ -1,6 +1,6 @@
 # jellyseerr-chart
 
-![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-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
 

docs/getting-started/buildfromsource.mdx

@@ -255,8 +255,7 @@ To run jellyseerr as a service:
 1. Download the [Non-Sucking Service Manager](https://nssm.cc/download)
 2. Install NSSM:
 ```powershell
-nssm install Jellyseerr "C:\Program Files\nodejs\node.exe" "C:\jellyseerr\dist\index.js"
-nssm set Jellyseerr AppDirectory "C:\jellyseerr"
+nssm install Jellyseerr "C:\Program Files\nodejs\node.exe" ["C:\jellyseerr\dist\index.js"]
 nssm set Jellyseerr AppEnvironmentExtra NODE_ENV=production
 ```
 3. Start the service:

server/routes/user/index.ts

@@ -60,24 +60,22 @@ router.get('/', async (req, res, next) => {
         query = query.orderBy('user.updatedAt', 'DESC');
         break;
       case 'displayname':
-        query = query
-          .addSelect(
-            `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
-              CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
-                CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
-                  "user"."email"
-                ELSE
-                  LOWER(user.jellyfinUsername)
-                END)
-              ELSE
-                LOWER(user.jellyfinUsername)
-              END)
-            ELSE
-              LOWER(user.username)
-            END`,
-            'displayname_sort_key'
-          )
-          .orderBy('displayname_sort_key', 'ASC');
+        query = query.orderBy(
+          `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
+             CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
+               CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
+                 "user"."email"
+               ELSE
+                 LOWER(user.jellyfinUsername)
+               END)
+             ELSE
+               LOWER(user.jellyfinUsername)
+             END)
+           ELSE
+             LOWER(user.username)
+           END`,
+          'ASC'
+        );
         break;
       case 'requests':
         query = query

server/utils/customProxyAgent.ts

@@ -8,9 +8,8 @@ export default async function createCustomProxyAgent(
 ) {
   const defaultAgent = new Agent({ keepAliveTimeout: 5000 });
 
-  const skipUrl = (url: string | URL) => {
-    const hostname =
-      typeof url === 'string' ? new URL(url).hostname : url.hostname;
+  const skipUrl = (url: string) => {
+    const hostname = new URL(url).hostname;
 
     if (proxySettings.bypassLocalAddresses && isLocalAddress(hostname)) {
       return true;
@@ -39,7 +38,8 @@ export default async function createCustomProxyAgent(
     dispatch: Dispatcher['dispatch']
   ): Dispatcher['dispatch'] => {
     return (opts, handler) => {
-      return opts.origin && skipUrl(opts.origin)
+      const url = opts.origin?.toString();
+      return url && skipUrl(url)
         ? defaultAgent.dispatch(opts, handler)
         : dispatch(opts, handler);
     };
@@ -60,10 +60,13 @@ export default async function createCustomProxyAgent(
         ':' +
         proxySettings.port,
       token,
+      interceptors: {
+        Client: [noProxyInterceptor],
+      },
       keepAliveTimeout: 5000,
     });
 
-    setGlobalDispatcher(proxyAgent.compose(noProxyInterceptor));
+    setGlobalDispatcher(proxyAgent);
   } catch (e) {
     logger.error('Failed to connect to the proxy: ' + e.message, {
       label: 'Proxy',
@@ -92,11 +95,7 @@ export default async function createCustomProxyAgent(
 }
 
 function isLocalAddress(hostname: string) {
-  if (
-    hostname === 'localhost' ||
-    hostname === '127.0.0.1' ||
-    hostname === '::1'
-  ) {
+  if (hostname === 'localhost' || hostname === '127.0.0.1') {
     return true;
   }
 

src/components/MovieDetails/index.tsx

@@ -590,7 +590,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                   buttonSize={'md'}
                   onClick={() => setShowBlacklistModal(true)}
                 >
-                  <EyeSlashIcon />
+                  <EyeSlashIcon className={'h-3'} />
                 </Button>
               </Tooltip>
             )}
@@ -608,9 +608,9 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                       onClick={onClickWatchlistBtn}
                     >
                       {isUpdating ? (
-                        <Spinner />
+                        <Spinner className="h-3" />
                       ) : (
-                        <StarIcon className={'text-amber-300'} />
+                        <StarIcon className={'h-3 text-amber-300'} />
                       )}
                     </Button>
                   </Tooltip>
@@ -623,7 +623,11 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                       buttonSize={'md'}
                       onClick={onClickDeleteWatchlistBtn}
                     >
-                      {isUpdating ? <Spinner /> : <MinusCircleIcon />}
+                      {isUpdating ? (
+                        <Spinner className="h-3" />
+                      ) : (
+                        <MinusCircleIcon className={'h-3'} />
+                      )}
                     </Button>
                   </Tooltip>
                 )}

src/components/TvDetails/index.tsx

@@ -632,7 +632,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                   buttonSize={'md'}
                   onClick={() => setShowBlacklistModal(true)}
                 >
-                  <EyeSlashIcon />
+                  <EyeSlashIcon className={'h-3'} />
                 </Button>
               </Tooltip>
             )}
@@ -650,9 +650,9 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                       onClick={onClickWatchlistBtn}
                     >
                       {isUpdating ? (
-                        <Spinner />
+                        <Spinner className="h-3" />
                       ) : (
-                        <StarIcon className={'text-amber-300'} />
+                        <StarIcon className={'h-3 text-amber-300'} />
                       )}
                     </Button>
                   </Tooltip>
@@ -665,7 +665,11 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                       buttonSize={'md'}
                       onClick={onClickDeleteWatchlistBtn}
                     >
-                      {isUpdating ? <Spinner /> : <MinusCircleIcon />}
+                      {isUpdating ? (
+                        <Spinner className="h-3" />
+                      ) : (
+                        <MinusCircleIcon className={'h-3'} />
+                      )}
                     </Button>
                   </Tooltip>
                 )}