diff --git a/api/src/models/collections.ts b/api/src/models/collections.ts index e7495e3c..452a7868 100644 --- a/api/src/models/collections.ts +++ b/api/src/models/collections.ts @@ -36,7 +36,7 @@ const BaseCollection = t.Object({ nextRefresh: t.String({ format: "date-time" }), - externalId: ExternalId, + externalId: ExternalId(), }); export const CollectionTranslation = t.Object({ diff --git a/api/src/models/entry/movie-entry.ts b/api/src/models/entry/movie-entry.ts index 318d60b9..95fcc501 100644 --- a/api/src/models/entry/movie-entry.ts +++ b/api/src/models/entry/movie-entry.ts @@ -19,7 +19,7 @@ export const BaseMovieEntry = t.Intersect( minimum: 1, description: "Absolute playback order. Can be mixed with episodes.", }), - externalId: ExternalId, + externalId: ExternalId(), }), BaseEntry(), ], diff --git a/api/src/models/examples/made-in-abyss.ts b/api/src/models/examples/made-in-abyss.ts index 8ab55617..6fd213e1 100644 --- a/api/src/models/examples/made-in-abyss.ts +++ b/api/src/models/examples/made-in-abyss.ts @@ -255,7 +255,7 @@ export const madeInAbyss = { externalId: { themoviedatabase: { dataId: "16738", - link: "https://www.themoviedb.org/company/16738/movie", + link: "https://www.themoviedb.org/company/16738", }, }, }, diff --git a/api/src/models/movie.ts b/api/src/models/movie.ts index 210b8b8e..a94528cb 100644 --- a/api/src/models/movie.ts +++ b/api/src/models/movie.ts @@ -36,7 +36,7 @@ const BaseMovie = t.Object({ nextRefresh: t.String({ format: "date-time" }), - externalId: ExternalId, + externalId: ExternalId(), }); export const MovieTranslation = t.Object({ diff --git a/api/src/models/serie.ts b/api/src/models/serie.ts index 3cce9511..c83d8433 100644 --- a/api/src/models/serie.ts +++ b/api/src/models/serie.ts @@ -46,7 +46,7 @@ const BaseSerie = t.Object({ nextRefresh: t.String({ format: "date-time" }), - externalId: ExternalId, + externalId: ExternalId(), }); export const SerieTranslation = t.Object({ diff --git a/api/src/models/studio.ts b/api/src/models/studio.ts index 649e0709..53d7ccdb 100644 --- a/api/src/models/studio.ts +++ b/api/src/models/studio.ts @@ -5,7 +5,7 @@ import { DbMetadata, ExternalId, Resource, TranslationRecord } from "./utils"; import { Image, SeedImage } from "./utils/image"; const BaseStudio = t.Object({ - externalId: ExternalId, + externalId: ExternalId(), }); export const StudioTranslation = t.Object({ diff --git a/api/src/models/utils/external-id.ts b/api/src/models/utils/external-id.ts index d449f4d5..dab28ea3 100644 --- a/api/src/models/utils/external-id.ts +++ b/api/src/models/utils/external-id.ts @@ -1,14 +1,13 @@ import { t } from "elysia"; import { comment } from "../../utils"; -export const ExternalId = t.Record( +export const ExternalId = () => t.Record( t.String(), t.Object({ dataId: t.String(), link: t.Nullable(t.String({ format: "uri" })), }), ); -export type ExternalId = typeof ExternalId.static; export const EpisodeId = t.Record( t.String(),