diff --git a/api/src/models/entry/base-entry.ts b/api/src/models/entry/base-entry.ts index 451422a1..2a59b32b 100644 --- a/api/src/models/entry/base-entry.ts +++ b/api/src/models/entry/base-entry.ts @@ -12,7 +12,6 @@ export const BaseEntry = () => ), thumbnail: t.Nullable(Image), - createdAt: t.String({ format: "date-time" }), nextRefresh: t.String({ format: "date-time" }), }); diff --git a/api/src/models/entry/episode.ts b/api/src/models/entry/episode.ts index 2372abe7..3c87b28e 100644 --- a/api/src/models/entry/episode.ts +++ b/api/src/models/entry/episode.ts @@ -1,7 +1,13 @@ import { t } from "elysia"; import type { Prettify } from "~/utils"; import { bubbleImages, madeInAbyss, registerExamples } from "../examples"; -import { EpisodeId, Resource, SeedImage, TranslationRecord } from "../utils"; +import { + DbMetadata, + EpisodeId, + Resource, + SeedImage, + TranslationRecord, +} from "../utils"; import { BaseEntry, EntryTranslation } from "./base-entry"; export const BaseEpisode = t.Intersect([ @@ -19,11 +25,12 @@ export const Episode = t.Intersect([ Resource(), EntryTranslation(), BaseEpisode, + DbMetadata, ]); export type Episode = Prettify; export const SeedEpisode = t.Intersect([ - t.Omit(BaseEpisode, ["thumbnail", "createdAt", "nextRefresh"]), + t.Omit(BaseEpisode, ["thumbnail", "nextRefresh"]), t.Object({ thumbnail: t.Nullable(SeedImage), translations: TranslationRecord(EntryTranslation()), diff --git a/api/src/models/entry/extra.ts b/api/src/models/entry/extra.ts index eb702b18..1d033753 100644 --- a/api/src/models/entry/extra.ts +++ b/api/src/models/entry/extra.ts @@ -1,7 +1,7 @@ import { t } from "elysia"; import { type Prettify, comment } from "~/utils"; import { madeInAbyss, registerExamples } from "../examples"; -import { SeedImage } from "../utils"; +import { DbMetadata, SeedImage } from "../utils"; import { Resource } from "../utils/resource"; import { BaseEntry } from "./base-entry"; @@ -31,11 +31,11 @@ export const BaseExtra = t.Intersect( }, ); -export const Extra = t.Intersect([Resource(), BaseExtra]); +export const Extra = t.Intersect([Resource(), BaseExtra, DbMetadata]); export type Extra = Prettify; export const SeedExtra = t.Intersect([ - t.Omit(BaseExtra, ["thumbnail", "createdAt"]), + t.Omit(BaseExtra, ["thumbnail"]), t.Object({ slug: t.String({ format: "slug" }), thumbnail: t.Nullable(SeedImage), diff --git a/api/src/models/entry/movie-entry.ts b/api/src/models/entry/movie-entry.ts index 8773fbf7..318d60b9 100644 --- a/api/src/models/entry/movie-entry.ts +++ b/api/src/models/entry/movie-entry.ts @@ -2,6 +2,7 @@ import { t } from "elysia"; import { type Prettify, comment } from "~/utils"; import { bubbleImages, madeInAbyss, registerExamples } from "../examples"; import { + DbMetadata, ExternalId, Image, Resource, @@ -42,11 +43,12 @@ export const MovieEntry = t.Intersect([ Resource(), MovieEntryTranslation, BaseMovieEntry, + DbMetadata, ]); export type MovieEntry = Prettify; export const SeedMovieEntry = t.Intersect([ - t.Omit(BaseMovieEntry, ["thumbnail", "createdAt", "nextRefresh"]), + t.Omit(BaseMovieEntry, ["thumbnail", "nextRefresh"]), t.Object({ slug: t.Optional(t.String({ format: "slug" })), thumbnail: t.Nullable(SeedImage), diff --git a/api/src/models/entry/special.ts b/api/src/models/entry/special.ts index 94d91683..248ff9d7 100644 --- a/api/src/models/entry/special.ts +++ b/api/src/models/entry/special.ts @@ -1,7 +1,13 @@ import { t } from "elysia"; import { type Prettify, comment } from "~/utils"; import { bubbleImages, madeInAbyss, registerExamples } from "../examples"; -import { EpisodeId, Resource, SeedImage, TranslationRecord } from "../utils"; +import { + DbMetadata, + EpisodeId, + Resource, + SeedImage, + TranslationRecord, +} from "../utils"; import { BaseEntry, EntryTranslation } from "./base-entry"; export const BaseSpecial = t.Intersect( @@ -29,11 +35,12 @@ export const Special = t.Intersect([ Resource(), EntryTranslation(), BaseSpecial, + DbMetadata, ]); export type Special = Prettify; export const SeedSpecial = t.Intersect([ - t.Omit(BaseSpecial, ["thumbnail", "createdAt", "nextRefresh"]), + t.Omit(BaseSpecial, ["thumbnail", "nextRefresh"]), t.Object({ thumbnail: t.Nullable(SeedImage), translations: TranslationRecord(EntryTranslation()), diff --git a/api/src/models/entry/unknown-entry.ts b/api/src/models/entry/unknown-entry.ts index 284bf856..efe1d380 100644 --- a/api/src/models/entry/unknown-entry.ts +++ b/api/src/models/entry/unknown-entry.ts @@ -1,8 +1,7 @@ import { t } from "elysia"; import { type Prettify, comment } from "~/utils"; -import { bubbleImages, registerExamples } from "../examples"; -import { youtubeExample } from "../examples/others"; -import { Resource } from "../utils/resource"; +import { bubbleImages, registerExamples, youtubeExample } from "../examples"; +import { DbMetadata, Resource } from "../utils"; import { BaseEntry, EntryTranslation } from "./base-entry"; export const BaseUnknownEntry = t.Intersect( @@ -28,6 +27,7 @@ export const UnknownEntry = t.Intersect([ Resource(), UnknownEntryTranslation, BaseUnknownEntry, + DbMetadata, ]); export type UnknownEntry = Prettify;