Merge remote-tracking branch 'overseerr/develop' into develop

server/models/Collection.ts

@@ -1,8 +1,9 @@
+import type { TmdbCollection } from '@server/api/themoviedb/interfaces';
+import { MediaType } from '@server/constants/media';
+import type Media from '@server/entity/Media';
 import { sortBy } from 'lodash';
-import type { TmdbCollection } from '../api/themoviedb/interfaces';
-import { MediaType } from '../constants/media';
-import Media from '../entity/Media';
-import { mapMovieResult, MovieResult } from './Search';
+import type { MovieResult } from './Search';
+import { mapMovieResult } from './Search';
 
 export interface Collection {
   id: number;

server/models/Movie.ts

@@ -2,20 +2,22 @@ import type {
   TmdbMovieDetails,
   TmdbMovieReleaseResult,
   TmdbProductionCompany,
-} from '../api/themoviedb/interfaces';
-import Media from '../entity/Media';
-import {
+} from '@server/api/themoviedb/interfaces';
+import type Media from '@server/entity/Media';
+import type {
   Cast,
   Crew,
   ExternalIds,
   Genre,
+  ProductionCompany,
+  WatchProviders,
+} from './common';
+import {
   mapCast,
   mapCrew,
   mapExternalIds,
   mapVideos,
   mapWatchProviders,
-  ProductionCompany,
-  WatchProviders,
 } from './common';
 
 export interface Video {

server/models/Person.ts

@@ -2,8 +2,8 @@ import type {
   TmdbPersonCreditCast,
   TmdbPersonCreditCrew,
   TmdbPersonDetails,
-} from '../api/themoviedb/interfaces';
-import Media from '../entity/Media';
+} from '@server/api/themoviedb/interfaces';
+import type Media from '@server/entity/Media';
 
 export interface PersonDetails {
   id: number;

server/models/Search.ts

@@ -5,9 +5,9 @@ import type {
   TmdbPersonResult,
   TmdbTvDetails,
   TmdbTvResult,
-} from '../api/themoviedb/interfaces';
-import { MediaType as MainMediaType } from '../constants/media';
-import Media from '../entity/Media';
+} from '@server/api/themoviedb/interfaces';
+import { MediaType as MainMediaType } from '@server/constants/media';
+import type Media from '@server/entity/Media';
 
 export type MediaType = 'tv' | 'movie' | 'person';
 

server/models/Tv.ts

@@ -5,24 +5,26 @@ import type {
   TmdbTvEpisodeResult,
   TmdbTvRatingResult,
   TmdbTvSeasonResult,
-} from '../api/themoviedb/interfaces';
-import type Media from '../entity/Media';
-import {
+} from '@server/api/themoviedb/interfaces';
+import type Media from '@server/entity/Media';
+import type {
   Cast,
   Crew,
   ExternalIds,
   Genre,
   Keyword,
+  ProductionCompany,
+  TvNetwork,
+  WatchProviders,
+} from './common';
+import {
   mapAggregateCast,
   mapCrew,
   mapExternalIds,
   mapVideos,
   mapWatchProviders,
-  ProductionCompany,
-  TvNetwork,
-  WatchProviders,
 } from './common';
-import { Video } from './Movie';
+import type { Video } from './Movie';
 
 interface Episode {
   id: number;

server/models/common.ts

@@ -7,8 +7,8 @@ import type {
   TmdbVideoResult,
   TmdbWatchProviderDetails,
   TmdbWatchProviders,
-} from '../api/themoviedb/interfaces';
-import { Video } from '../models/Movie';
+} from '@server/api/themoviedb/interfaces';
+import type { Video } from '@server/models/Movie';
 
 export interface ProductionCompany {
   id: number;