From bb9b47f55e0b3e8e17a4a03673741a5d6be7b2a4 Mon Sep 17 00:00:00 2001 From: Infinite Date: Tue, 1 Feb 2022 21:18:46 +0000 Subject: [PATCH] Allow null images in edits to account for deleted images --- .../src/components/editCard/ModifyEdit.tsx | 14 ++++---- frontend/src/graphql/definitions/ApplyEdit.ts | 16 ++++----- frontend/src/graphql/definitions/Edit.ts | 16 ++++----- .../src/graphql/definitions/EditFragment.ts | 16 ++++----- frontend/src/graphql/definitions/Edits.ts | 16 ++++----- .../src/graphql/definitions/PerformerEdit.ts | 16 ++++----- frontend/src/graphql/definitions/SceneEdit.ts | 16 ++++----- .../src/graphql/definitions/StudioEdit.ts | 16 ++++----- frontend/src/graphql/definitions/TagEdit.ts | 16 ++++----- frontend/src/graphql/definitions/Vote.ts | 16 ++++----- graphql/schema/types/performer.graphql | 4 +-- graphql/schema/types/scene.graphql | 4 +-- graphql/schema/types/studio.graphql | 4 +-- pkg/models/generated_exec.go | 34 ++++++++----------- 14 files changed, 100 insertions(+), 104 deletions(-) diff --git a/frontend/src/components/editCard/ModifyEdit.tsx b/frontend/src/components/editCard/ModifyEdit.tsx index 6993017f8..469a470d6 100644 --- a/frontend/src/components/editCard/ModifyEdit.tsx +++ b/frontend/src/components/editCard/ModifyEdit.tsx @@ -134,8 +134,8 @@ export interface PerformerDetails { removed_piercings?: BodyMod[] | null; added_aliases?: string[] | null; removed_aliases?: string[] | null; - added_images?: Image[] | null; - removed_images?: Image[] | null; + added_images?: NullableImage[] | null; + removed_images?: NullableImage[] | null; added_urls?: URL[] | null; removed_urls?: URL[] | null; draft_id?: string | null; @@ -310,6 +310,8 @@ type ScenePerformance = { >; }; +type NullableImage = Image | null; + export interface SceneDetails { title: string | null; date: string | null; @@ -322,8 +324,8 @@ export interface SceneDetails { } | null; added_performers?: ScenePerformance[] | null; removed_performers?: ScenePerformance[] | null; - added_images?: Image[] | null; - removed_images?: Image[] | null; + added_images?: NullableImage[] | null; + removed_images?: NullableImage[] | null; added_urls?: URL[] | null; removed_urls?: URL[] | null; added_tags?: @@ -460,8 +462,8 @@ export interface StudioDetails { id: string; name: string; } | null; - added_images?: Image[] | null; - removed_images?: Image[] | null; + added_images?: NullableImage[] | null; + removed_images?: NullableImage[] | null; added_urls?: URL[] | null; removed_urls?: URL[] | null; } diff --git a/frontend/src/graphql/definitions/ApplyEdit.ts b/frontend/src/graphql/definitions/ApplyEdit.ts index 9e75849c6..1b7e1bb47 100644 --- a/frontend/src/graphql/definitions/ApplyEdit.ts +++ b/frontend/src/graphql/definitions/ApplyEdit.ts @@ -372,8 +372,8 @@ export interface ApplyEdit_applyEdit_details_PerformerEdit { removed_tattoos: ApplyEdit_applyEdit_details_PerformerEdit_removed_tattoos[] | null; added_piercings: ApplyEdit_applyEdit_details_PerformerEdit_added_piercings[] | null; removed_piercings: ApplyEdit_applyEdit_details_PerformerEdit_removed_piercings[] | null; - added_images: ApplyEdit_applyEdit_details_PerformerEdit_added_images[] | null; - removed_images: ApplyEdit_applyEdit_details_PerformerEdit_removed_images[] | null; + added_images: (ApplyEdit_applyEdit_details_PerformerEdit_added_images | null)[] | null; + removed_images: (ApplyEdit_applyEdit_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface ApplyEdit_applyEdit_details_StudioEdit { added_urls: ApplyEdit_applyEdit_details_StudioEdit_added_urls[] | null; removed_urls: ApplyEdit_applyEdit_details_StudioEdit_removed_urls[] | null; parent: ApplyEdit_applyEdit_details_StudioEdit_parent | null; - added_images: ApplyEdit_applyEdit_details_StudioEdit_added_images[] | null; - removed_images: ApplyEdit_applyEdit_details_StudioEdit_removed_images[] | null; + added_images: (ApplyEdit_applyEdit_details_StudioEdit_added_images | null)[] | null; + removed_images: (ApplyEdit_applyEdit_details_StudioEdit_removed_images | null)[] | null; } export interface ApplyEdit_applyEdit_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface ApplyEdit_applyEdit_details_SceneEdit { removed_performers: ApplyEdit_applyEdit_details_SceneEdit_removed_performers[] | null; added_tags: ApplyEdit_applyEdit_details_SceneEdit_added_tags[] | null; removed_tags: ApplyEdit_applyEdit_details_SceneEdit_removed_tags[] | null; - added_images: ApplyEdit_applyEdit_details_SceneEdit_added_images[] | null; - removed_images: ApplyEdit_applyEdit_details_SceneEdit_removed_images[] | null; + added_images: (ApplyEdit_applyEdit_details_SceneEdit_added_images | null)[] | null; + removed_images: (ApplyEdit_applyEdit_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: ApplyEdit_applyEdit_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: ApplyEdit_applyEdit_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface ApplyEdit_applyEdit_old_details_SceneEdit { removed_performers: ApplyEdit_applyEdit_old_details_SceneEdit_removed_performers[] | null; added_tags: ApplyEdit_applyEdit_old_details_SceneEdit_added_tags[] | null; removed_tags: ApplyEdit_applyEdit_old_details_SceneEdit_removed_tags[] | null; - added_images: ApplyEdit_applyEdit_old_details_SceneEdit_added_images[] | null; - removed_images: ApplyEdit_applyEdit_old_details_SceneEdit_removed_images[] | null; + added_images: (ApplyEdit_applyEdit_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (ApplyEdit_applyEdit_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: ApplyEdit_applyEdit_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: ApplyEdit_applyEdit_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/Edit.ts b/frontend/src/graphql/definitions/Edit.ts index 34cfa1ec8..cd3b29c4e 100644 --- a/frontend/src/graphql/definitions/Edit.ts +++ b/frontend/src/graphql/definitions/Edit.ts @@ -372,8 +372,8 @@ export interface Edit_findEdit_details_PerformerEdit { removed_tattoos: Edit_findEdit_details_PerformerEdit_removed_tattoos[] | null; added_piercings: Edit_findEdit_details_PerformerEdit_added_piercings[] | null; removed_piercings: Edit_findEdit_details_PerformerEdit_removed_piercings[] | null; - added_images: Edit_findEdit_details_PerformerEdit_added_images[] | null; - removed_images: Edit_findEdit_details_PerformerEdit_removed_images[] | null; + added_images: (Edit_findEdit_details_PerformerEdit_added_images | null)[] | null; + removed_images: (Edit_findEdit_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface Edit_findEdit_details_StudioEdit { added_urls: Edit_findEdit_details_StudioEdit_added_urls[] | null; removed_urls: Edit_findEdit_details_StudioEdit_removed_urls[] | null; parent: Edit_findEdit_details_StudioEdit_parent | null; - added_images: Edit_findEdit_details_StudioEdit_added_images[] | null; - removed_images: Edit_findEdit_details_StudioEdit_removed_images[] | null; + added_images: (Edit_findEdit_details_StudioEdit_added_images | null)[] | null; + removed_images: (Edit_findEdit_details_StudioEdit_removed_images | null)[] | null; } export interface Edit_findEdit_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface Edit_findEdit_details_SceneEdit { removed_performers: Edit_findEdit_details_SceneEdit_removed_performers[] | null; added_tags: Edit_findEdit_details_SceneEdit_added_tags[] | null; removed_tags: Edit_findEdit_details_SceneEdit_removed_tags[] | null; - added_images: Edit_findEdit_details_SceneEdit_added_images[] | null; - removed_images: Edit_findEdit_details_SceneEdit_removed_images[] | null; + added_images: (Edit_findEdit_details_SceneEdit_added_images | null)[] | null; + removed_images: (Edit_findEdit_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: Edit_findEdit_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: Edit_findEdit_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface Edit_findEdit_old_details_SceneEdit { removed_performers: Edit_findEdit_old_details_SceneEdit_removed_performers[] | null; added_tags: Edit_findEdit_old_details_SceneEdit_added_tags[] | null; removed_tags: Edit_findEdit_old_details_SceneEdit_removed_tags[] | null; - added_images: Edit_findEdit_old_details_SceneEdit_added_images[] | null; - removed_images: Edit_findEdit_old_details_SceneEdit_removed_images[] | null; + added_images: (Edit_findEdit_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (Edit_findEdit_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: Edit_findEdit_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: Edit_findEdit_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/EditFragment.ts b/frontend/src/graphql/definitions/EditFragment.ts index 2ee128a06..b8c61b594 100644 --- a/frontend/src/graphql/definitions/EditFragment.ts +++ b/frontend/src/graphql/definitions/EditFragment.ts @@ -372,8 +372,8 @@ export interface EditFragment_details_PerformerEdit { removed_tattoos: EditFragment_details_PerformerEdit_removed_tattoos[] | null; added_piercings: EditFragment_details_PerformerEdit_added_piercings[] | null; removed_piercings: EditFragment_details_PerformerEdit_removed_piercings[] | null; - added_images: EditFragment_details_PerformerEdit_added_images[] | null; - removed_images: EditFragment_details_PerformerEdit_removed_images[] | null; + added_images: (EditFragment_details_PerformerEdit_added_images | null)[] | null; + removed_images: (EditFragment_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface EditFragment_details_StudioEdit { added_urls: EditFragment_details_StudioEdit_added_urls[] | null; removed_urls: EditFragment_details_StudioEdit_removed_urls[] | null; parent: EditFragment_details_StudioEdit_parent | null; - added_images: EditFragment_details_StudioEdit_added_images[] | null; - removed_images: EditFragment_details_StudioEdit_removed_images[] | null; + added_images: (EditFragment_details_StudioEdit_added_images | null)[] | null; + removed_images: (EditFragment_details_StudioEdit_removed_images | null)[] | null; } export interface EditFragment_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface EditFragment_details_SceneEdit { removed_performers: EditFragment_details_SceneEdit_removed_performers[] | null; added_tags: EditFragment_details_SceneEdit_added_tags[] | null; removed_tags: EditFragment_details_SceneEdit_removed_tags[] | null; - added_images: EditFragment_details_SceneEdit_added_images[] | null; - removed_images: EditFragment_details_SceneEdit_removed_images[] | null; + added_images: (EditFragment_details_SceneEdit_added_images | null)[] | null; + removed_images: (EditFragment_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: EditFragment_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: EditFragment_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface EditFragment_old_details_SceneEdit { removed_performers: EditFragment_old_details_SceneEdit_removed_performers[] | null; added_tags: EditFragment_old_details_SceneEdit_added_tags[] | null; removed_tags: EditFragment_old_details_SceneEdit_removed_tags[] | null; - added_images: EditFragment_old_details_SceneEdit_added_images[] | null; - removed_images: EditFragment_old_details_SceneEdit_removed_images[] | null; + added_images: (EditFragment_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (EditFragment_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: EditFragment_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: EditFragment_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/Edits.ts b/frontend/src/graphql/definitions/Edits.ts index 2e841a1fc..706e07620 100644 --- a/frontend/src/graphql/definitions/Edits.ts +++ b/frontend/src/graphql/definitions/Edits.ts @@ -372,8 +372,8 @@ export interface Edits_queryEdits_edits_details_PerformerEdit { removed_tattoos: Edits_queryEdits_edits_details_PerformerEdit_removed_tattoos[] | null; added_piercings: Edits_queryEdits_edits_details_PerformerEdit_added_piercings[] | null; removed_piercings: Edits_queryEdits_edits_details_PerformerEdit_removed_piercings[] | null; - added_images: Edits_queryEdits_edits_details_PerformerEdit_added_images[] | null; - removed_images: Edits_queryEdits_edits_details_PerformerEdit_removed_images[] | null; + added_images: (Edits_queryEdits_edits_details_PerformerEdit_added_images | null)[] | null; + removed_images: (Edits_queryEdits_edits_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface Edits_queryEdits_edits_details_StudioEdit { added_urls: Edits_queryEdits_edits_details_StudioEdit_added_urls[] | null; removed_urls: Edits_queryEdits_edits_details_StudioEdit_removed_urls[] | null; parent: Edits_queryEdits_edits_details_StudioEdit_parent | null; - added_images: Edits_queryEdits_edits_details_StudioEdit_added_images[] | null; - removed_images: Edits_queryEdits_edits_details_StudioEdit_removed_images[] | null; + added_images: (Edits_queryEdits_edits_details_StudioEdit_added_images | null)[] | null; + removed_images: (Edits_queryEdits_edits_details_StudioEdit_removed_images | null)[] | null; } export interface Edits_queryEdits_edits_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface Edits_queryEdits_edits_details_SceneEdit { removed_performers: Edits_queryEdits_edits_details_SceneEdit_removed_performers[] | null; added_tags: Edits_queryEdits_edits_details_SceneEdit_added_tags[] | null; removed_tags: Edits_queryEdits_edits_details_SceneEdit_removed_tags[] | null; - added_images: Edits_queryEdits_edits_details_SceneEdit_added_images[] | null; - removed_images: Edits_queryEdits_edits_details_SceneEdit_removed_images[] | null; + added_images: (Edits_queryEdits_edits_details_SceneEdit_added_images | null)[] | null; + removed_images: (Edits_queryEdits_edits_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: Edits_queryEdits_edits_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: Edits_queryEdits_edits_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface Edits_queryEdits_edits_old_details_SceneEdit { removed_performers: Edits_queryEdits_edits_old_details_SceneEdit_removed_performers[] | null; added_tags: Edits_queryEdits_edits_old_details_SceneEdit_added_tags[] | null; removed_tags: Edits_queryEdits_edits_old_details_SceneEdit_removed_tags[] | null; - added_images: Edits_queryEdits_edits_old_details_SceneEdit_added_images[] | null; - removed_images: Edits_queryEdits_edits_old_details_SceneEdit_removed_images[] | null; + added_images: (Edits_queryEdits_edits_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (Edits_queryEdits_edits_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: Edits_queryEdits_edits_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: Edits_queryEdits_edits_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/PerformerEdit.ts b/frontend/src/graphql/definitions/PerformerEdit.ts index 9de619807..d5f7dd7d5 100644 --- a/frontend/src/graphql/definitions/PerformerEdit.ts +++ b/frontend/src/graphql/definitions/PerformerEdit.ts @@ -372,8 +372,8 @@ export interface PerformerEdit_performerEdit_details_PerformerEdit { removed_tattoos: PerformerEdit_performerEdit_details_PerformerEdit_removed_tattoos[] | null; added_piercings: PerformerEdit_performerEdit_details_PerformerEdit_added_piercings[] | null; removed_piercings: PerformerEdit_performerEdit_details_PerformerEdit_removed_piercings[] | null; - added_images: PerformerEdit_performerEdit_details_PerformerEdit_added_images[] | null; - removed_images: PerformerEdit_performerEdit_details_PerformerEdit_removed_images[] | null; + added_images: (PerformerEdit_performerEdit_details_PerformerEdit_added_images | null)[] | null; + removed_images: (PerformerEdit_performerEdit_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface PerformerEdit_performerEdit_details_StudioEdit { added_urls: PerformerEdit_performerEdit_details_StudioEdit_added_urls[] | null; removed_urls: PerformerEdit_performerEdit_details_StudioEdit_removed_urls[] | null; parent: PerformerEdit_performerEdit_details_StudioEdit_parent | null; - added_images: PerformerEdit_performerEdit_details_StudioEdit_added_images[] | null; - removed_images: PerformerEdit_performerEdit_details_StudioEdit_removed_images[] | null; + added_images: (PerformerEdit_performerEdit_details_StudioEdit_added_images | null)[] | null; + removed_images: (PerformerEdit_performerEdit_details_StudioEdit_removed_images | null)[] | null; } export interface PerformerEdit_performerEdit_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface PerformerEdit_performerEdit_details_SceneEdit { removed_performers: PerformerEdit_performerEdit_details_SceneEdit_removed_performers[] | null; added_tags: PerformerEdit_performerEdit_details_SceneEdit_added_tags[] | null; removed_tags: PerformerEdit_performerEdit_details_SceneEdit_removed_tags[] | null; - added_images: PerformerEdit_performerEdit_details_SceneEdit_added_images[] | null; - removed_images: PerformerEdit_performerEdit_details_SceneEdit_removed_images[] | null; + added_images: (PerformerEdit_performerEdit_details_SceneEdit_added_images | null)[] | null; + removed_images: (PerformerEdit_performerEdit_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: PerformerEdit_performerEdit_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: PerformerEdit_performerEdit_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface PerformerEdit_performerEdit_old_details_SceneEdit { removed_performers: PerformerEdit_performerEdit_old_details_SceneEdit_removed_performers[] | null; added_tags: PerformerEdit_performerEdit_old_details_SceneEdit_added_tags[] | null; removed_tags: PerformerEdit_performerEdit_old_details_SceneEdit_removed_tags[] | null; - added_images: PerformerEdit_performerEdit_old_details_SceneEdit_added_images[] | null; - removed_images: PerformerEdit_performerEdit_old_details_SceneEdit_removed_images[] | null; + added_images: (PerformerEdit_performerEdit_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (PerformerEdit_performerEdit_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: PerformerEdit_performerEdit_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: PerformerEdit_performerEdit_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/SceneEdit.ts b/frontend/src/graphql/definitions/SceneEdit.ts index 33d091c30..5e5a21e24 100644 --- a/frontend/src/graphql/definitions/SceneEdit.ts +++ b/frontend/src/graphql/definitions/SceneEdit.ts @@ -372,8 +372,8 @@ export interface SceneEdit_sceneEdit_details_PerformerEdit { removed_tattoos: SceneEdit_sceneEdit_details_PerformerEdit_removed_tattoos[] | null; added_piercings: SceneEdit_sceneEdit_details_PerformerEdit_added_piercings[] | null; removed_piercings: SceneEdit_sceneEdit_details_PerformerEdit_removed_piercings[] | null; - added_images: SceneEdit_sceneEdit_details_PerformerEdit_added_images[] | null; - removed_images: SceneEdit_sceneEdit_details_PerformerEdit_removed_images[] | null; + added_images: (SceneEdit_sceneEdit_details_PerformerEdit_added_images | null)[] | null; + removed_images: (SceneEdit_sceneEdit_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface SceneEdit_sceneEdit_details_StudioEdit { added_urls: SceneEdit_sceneEdit_details_StudioEdit_added_urls[] | null; removed_urls: SceneEdit_sceneEdit_details_StudioEdit_removed_urls[] | null; parent: SceneEdit_sceneEdit_details_StudioEdit_parent | null; - added_images: SceneEdit_sceneEdit_details_StudioEdit_added_images[] | null; - removed_images: SceneEdit_sceneEdit_details_StudioEdit_removed_images[] | null; + added_images: (SceneEdit_sceneEdit_details_StudioEdit_added_images | null)[] | null; + removed_images: (SceneEdit_sceneEdit_details_StudioEdit_removed_images | null)[] | null; } export interface SceneEdit_sceneEdit_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface SceneEdit_sceneEdit_details_SceneEdit { removed_performers: SceneEdit_sceneEdit_details_SceneEdit_removed_performers[] | null; added_tags: SceneEdit_sceneEdit_details_SceneEdit_added_tags[] | null; removed_tags: SceneEdit_sceneEdit_details_SceneEdit_removed_tags[] | null; - added_images: SceneEdit_sceneEdit_details_SceneEdit_added_images[] | null; - removed_images: SceneEdit_sceneEdit_details_SceneEdit_removed_images[] | null; + added_images: (SceneEdit_sceneEdit_details_SceneEdit_added_images | null)[] | null; + removed_images: (SceneEdit_sceneEdit_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: SceneEdit_sceneEdit_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: SceneEdit_sceneEdit_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface SceneEdit_sceneEdit_old_details_SceneEdit { removed_performers: SceneEdit_sceneEdit_old_details_SceneEdit_removed_performers[] | null; added_tags: SceneEdit_sceneEdit_old_details_SceneEdit_added_tags[] | null; removed_tags: SceneEdit_sceneEdit_old_details_SceneEdit_removed_tags[] | null; - added_images: SceneEdit_sceneEdit_old_details_SceneEdit_added_images[] | null; - removed_images: SceneEdit_sceneEdit_old_details_SceneEdit_removed_images[] | null; + added_images: (SceneEdit_sceneEdit_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (SceneEdit_sceneEdit_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: SceneEdit_sceneEdit_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: SceneEdit_sceneEdit_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/StudioEdit.ts b/frontend/src/graphql/definitions/StudioEdit.ts index a253e4a96..974823337 100644 --- a/frontend/src/graphql/definitions/StudioEdit.ts +++ b/frontend/src/graphql/definitions/StudioEdit.ts @@ -372,8 +372,8 @@ export interface StudioEdit_studioEdit_details_PerformerEdit { removed_tattoos: StudioEdit_studioEdit_details_PerformerEdit_removed_tattoos[] | null; added_piercings: StudioEdit_studioEdit_details_PerformerEdit_added_piercings[] | null; removed_piercings: StudioEdit_studioEdit_details_PerformerEdit_removed_piercings[] | null; - added_images: StudioEdit_studioEdit_details_PerformerEdit_added_images[] | null; - removed_images: StudioEdit_studioEdit_details_PerformerEdit_removed_images[] | null; + added_images: (StudioEdit_studioEdit_details_PerformerEdit_added_images | null)[] | null; + removed_images: (StudioEdit_studioEdit_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface StudioEdit_studioEdit_details_StudioEdit { added_urls: StudioEdit_studioEdit_details_StudioEdit_added_urls[] | null; removed_urls: StudioEdit_studioEdit_details_StudioEdit_removed_urls[] | null; parent: StudioEdit_studioEdit_details_StudioEdit_parent | null; - added_images: StudioEdit_studioEdit_details_StudioEdit_added_images[] | null; - removed_images: StudioEdit_studioEdit_details_StudioEdit_removed_images[] | null; + added_images: (StudioEdit_studioEdit_details_StudioEdit_added_images | null)[] | null; + removed_images: (StudioEdit_studioEdit_details_StudioEdit_removed_images | null)[] | null; } export interface StudioEdit_studioEdit_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface StudioEdit_studioEdit_details_SceneEdit { removed_performers: StudioEdit_studioEdit_details_SceneEdit_removed_performers[] | null; added_tags: StudioEdit_studioEdit_details_SceneEdit_added_tags[] | null; removed_tags: StudioEdit_studioEdit_details_SceneEdit_removed_tags[] | null; - added_images: StudioEdit_studioEdit_details_SceneEdit_added_images[] | null; - removed_images: StudioEdit_studioEdit_details_SceneEdit_removed_images[] | null; + added_images: (StudioEdit_studioEdit_details_SceneEdit_added_images | null)[] | null; + removed_images: (StudioEdit_studioEdit_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: StudioEdit_studioEdit_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: StudioEdit_studioEdit_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface StudioEdit_studioEdit_old_details_SceneEdit { removed_performers: StudioEdit_studioEdit_old_details_SceneEdit_removed_performers[] | null; added_tags: StudioEdit_studioEdit_old_details_SceneEdit_added_tags[] | null; removed_tags: StudioEdit_studioEdit_old_details_SceneEdit_removed_tags[] | null; - added_images: StudioEdit_studioEdit_old_details_SceneEdit_added_images[] | null; - removed_images: StudioEdit_studioEdit_old_details_SceneEdit_removed_images[] | null; + added_images: (StudioEdit_studioEdit_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (StudioEdit_studioEdit_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: StudioEdit_studioEdit_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: StudioEdit_studioEdit_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/TagEdit.ts b/frontend/src/graphql/definitions/TagEdit.ts index 815ef1b3c..5af9f59ef 100644 --- a/frontend/src/graphql/definitions/TagEdit.ts +++ b/frontend/src/graphql/definitions/TagEdit.ts @@ -372,8 +372,8 @@ export interface TagEdit_tagEdit_details_PerformerEdit { removed_tattoos: TagEdit_tagEdit_details_PerformerEdit_removed_tattoos[] | null; added_piercings: TagEdit_tagEdit_details_PerformerEdit_added_piercings[] | null; removed_piercings: TagEdit_tagEdit_details_PerformerEdit_removed_piercings[] | null; - added_images: TagEdit_tagEdit_details_PerformerEdit_added_images[] | null; - removed_images: TagEdit_tagEdit_details_PerformerEdit_removed_images[] | null; + added_images: (TagEdit_tagEdit_details_PerformerEdit_added_images | null)[] | null; + removed_images: (TagEdit_tagEdit_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface TagEdit_tagEdit_details_StudioEdit { added_urls: TagEdit_tagEdit_details_StudioEdit_added_urls[] | null; removed_urls: TagEdit_tagEdit_details_StudioEdit_removed_urls[] | null; parent: TagEdit_tagEdit_details_StudioEdit_parent | null; - added_images: TagEdit_tagEdit_details_StudioEdit_added_images[] | null; - removed_images: TagEdit_tagEdit_details_StudioEdit_removed_images[] | null; + added_images: (TagEdit_tagEdit_details_StudioEdit_added_images | null)[] | null; + removed_images: (TagEdit_tagEdit_details_StudioEdit_removed_images | null)[] | null; } export interface TagEdit_tagEdit_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface TagEdit_tagEdit_details_SceneEdit { removed_performers: TagEdit_tagEdit_details_SceneEdit_removed_performers[] | null; added_tags: TagEdit_tagEdit_details_SceneEdit_added_tags[] | null; removed_tags: TagEdit_tagEdit_details_SceneEdit_removed_tags[] | null; - added_images: TagEdit_tagEdit_details_SceneEdit_added_images[] | null; - removed_images: TagEdit_tagEdit_details_SceneEdit_removed_images[] | null; + added_images: (TagEdit_tagEdit_details_SceneEdit_added_images | null)[] | null; + removed_images: (TagEdit_tagEdit_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: TagEdit_tagEdit_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: TagEdit_tagEdit_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface TagEdit_tagEdit_old_details_SceneEdit { removed_performers: TagEdit_tagEdit_old_details_SceneEdit_removed_performers[] | null; added_tags: TagEdit_tagEdit_old_details_SceneEdit_added_tags[] | null; removed_tags: TagEdit_tagEdit_old_details_SceneEdit_removed_tags[] | null; - added_images: TagEdit_tagEdit_old_details_SceneEdit_added_images[] | null; - removed_images: TagEdit_tagEdit_old_details_SceneEdit_removed_images[] | null; + added_images: (TagEdit_tagEdit_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (TagEdit_tagEdit_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: TagEdit_tagEdit_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: TagEdit_tagEdit_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/frontend/src/graphql/definitions/Vote.ts b/frontend/src/graphql/definitions/Vote.ts index 7ce087c5b..816efd59a 100644 --- a/frontend/src/graphql/definitions/Vote.ts +++ b/frontend/src/graphql/definitions/Vote.ts @@ -372,8 +372,8 @@ export interface Vote_editVote_details_PerformerEdit { removed_tattoos: Vote_editVote_details_PerformerEdit_removed_tattoos[] | null; added_piercings: Vote_editVote_details_PerformerEdit_added_piercings[] | null; removed_piercings: Vote_editVote_details_PerformerEdit_removed_piercings[] | null; - added_images: Vote_editVote_details_PerformerEdit_added_images[] | null; - removed_images: Vote_editVote_details_PerformerEdit_removed_images[] | null; + added_images: (Vote_editVote_details_PerformerEdit_added_images | null)[] | null; + removed_images: (Vote_editVote_details_PerformerEdit_removed_images | null)[] | null; draft_id: string | null; } @@ -473,8 +473,8 @@ export interface Vote_editVote_details_StudioEdit { added_urls: Vote_editVote_details_StudioEdit_added_urls[] | null; removed_urls: Vote_editVote_details_StudioEdit_removed_urls[] | null; parent: Vote_editVote_details_StudioEdit_parent | null; - added_images: Vote_editVote_details_StudioEdit_added_images[] | null; - removed_images: Vote_editVote_details_StudioEdit_removed_images[] | null; + added_images: (Vote_editVote_details_StudioEdit_added_images | null)[] | null; + removed_images: (Vote_editVote_details_StudioEdit_removed_images | null)[] | null; } export interface Vote_editVote_details_SceneEdit_added_urls_site { @@ -793,8 +793,8 @@ export interface Vote_editVote_details_SceneEdit { removed_performers: Vote_editVote_details_SceneEdit_removed_performers[] | null; added_tags: Vote_editVote_details_SceneEdit_added_tags[] | null; removed_tags: Vote_editVote_details_SceneEdit_removed_tags[] | null; - added_images: Vote_editVote_details_SceneEdit_added_images[] | null; - removed_images: Vote_editVote_details_SceneEdit_removed_images[] | null; + added_images: (Vote_editVote_details_SceneEdit_added_images | null)[] | null; + removed_images: (Vote_editVote_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: Vote_editVote_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: Vote_editVote_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; @@ -1208,8 +1208,8 @@ export interface Vote_editVote_old_details_SceneEdit { removed_performers: Vote_editVote_old_details_SceneEdit_removed_performers[] | null; added_tags: Vote_editVote_old_details_SceneEdit_added_tags[] | null; removed_tags: Vote_editVote_old_details_SceneEdit_removed_tags[] | null; - added_images: Vote_editVote_old_details_SceneEdit_added_images[] | null; - removed_images: Vote_editVote_old_details_SceneEdit_removed_images[] | null; + added_images: (Vote_editVote_old_details_SceneEdit_added_images | null)[] | null; + removed_images: (Vote_editVote_old_details_SceneEdit_removed_images | null)[] | null; added_fingerprints: Vote_editVote_old_details_SceneEdit_added_fingerprints[] | null; removed_fingerprints: Vote_editVote_old_details_SceneEdit_removed_fingerprints[] | null; duration: number | null; diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql index c3706e503..ef89a4e1c 100644 --- a/graphql/schema/types/performer.graphql +++ b/graphql/schema/types/performer.graphql @@ -237,8 +237,8 @@ type PerformerEdit { removed_tattoos: [BodyModification!] added_piercings: [BodyModification!] removed_piercings: [BodyModification!] - added_images: [Image!] - removed_images: [Image!] + added_images: [Image] + removed_images: [Image] draft_id: ID } diff --git a/graphql/schema/types/scene.graphql b/graphql/schema/types/scene.graphql index 466fbaa78..b733c98af 100644 --- a/graphql/schema/types/scene.graphql +++ b/graphql/schema/types/scene.graphql @@ -151,8 +151,8 @@ type SceneEdit { removed_performers: [PerformerAppearance!] added_tags: [Tag!] removed_tags: [Tag!] - added_images: [Image!] - removed_images: [Image!] + added_images: [Image] + removed_images: [Image] added_fingerprints: [Fingerprint!] removed_fingerprints: [Fingerprint!] duration: Int diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql index 70a1dd99c..ed0220030 100644 --- a/graphql/schema/types/studio.graphql +++ b/graphql/schema/types/studio.graphql @@ -49,8 +49,8 @@ type StudioEdit { added_urls: [URL!] removed_urls: [URL!] parent: Studio - added_images: [Image!] - removed_images: [Image!] + added_images: [Image] + removed_images: [Image] } type QueryStudiosResultType { diff --git a/pkg/models/generated_exec.go b/pkg/models/generated_exec.go index 67380a2fd..bb41cd20a 100644 --- a/pkg/models/generated_exec.go +++ b/pkg/models/generated_exec.go @@ -4133,8 +4133,8 @@ type PerformerEdit { removed_tattoos: [BodyModification!] added_piercings: [BodyModification!] removed_piercings: [BodyModification!] - added_images: [Image!] - removed_images: [Image!] + added_images: [Image] + removed_images: [Image] draft_id: ID } @@ -4406,8 +4406,8 @@ type SceneEdit { removed_performers: [PerformerAppearance!] added_tags: [Tag!] removed_tags: [Tag!] - added_images: [Image!] - removed_images: [Image!] + added_images: [Image] + removed_images: [Image] added_fingerprints: [Fingerprint!] removed_fingerprints: [Fingerprint!] duration: Int @@ -4566,8 +4566,8 @@ type StudioEdit { added_urls: [URL!] removed_urls: [URL!] parent: Studio - added_images: [Image!] - removed_images: [Image!] + added_images: [Image] + removed_images: [Image] } type QueryStudiosResultType { @@ -13160,7 +13160,7 @@ func (ec *executionContext) _PerformerEdit_added_images(ctx context.Context, fie } res := resTmp.([]*Image) fc.Result = res - return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImageᚄ(ctx, field.Selections, res) + return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, field.Selections, res) } func (ec *executionContext) _PerformerEdit_removed_images(ctx context.Context, field graphql.CollectedField, obj *PerformerEdit) (ret graphql.Marshaler) { @@ -13192,7 +13192,7 @@ func (ec *executionContext) _PerformerEdit_removed_images(ctx context.Context, f } res := resTmp.([]*Image) fc.Result = res - return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImageᚄ(ctx, field.Selections, res) + return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, field.Selections, res) } func (ec *executionContext) _PerformerEdit_draft_id(ctx context.Context, field graphql.CollectedField, obj *PerformerEdit) (ret graphql.Marshaler) { @@ -16817,7 +16817,7 @@ func (ec *executionContext) _SceneEdit_added_images(ctx context.Context, field g } res := resTmp.([]*Image) fc.Result = res - return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImageᚄ(ctx, field.Selections, res) + return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, field.Selections, res) } func (ec *executionContext) _SceneEdit_removed_images(ctx context.Context, field graphql.CollectedField, obj *SceneEdit) (ret graphql.Marshaler) { @@ -16849,7 +16849,7 @@ func (ec *executionContext) _SceneEdit_removed_images(ctx context.Context, field } res := resTmp.([]*Image) fc.Result = res - return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImageᚄ(ctx, field.Selections, res) + return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, field.Selections, res) } func (ec *executionContext) _SceneEdit_added_fingerprints(ctx context.Context, field graphql.CollectedField, obj *SceneEdit) (ret graphql.Marshaler) { @@ -18099,7 +18099,7 @@ func (ec *executionContext) _StudioEdit_added_images(ctx context.Context, field } res := resTmp.([]*Image) fc.Result = res - return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImageᚄ(ctx, field.Selections, res) + return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, field.Selections, res) } func (ec *executionContext) _StudioEdit_removed_images(ctx context.Context, field graphql.CollectedField, obj *StudioEdit) (ret graphql.Marshaler) { @@ -18131,7 +18131,7 @@ func (ec *executionContext) _StudioEdit_removed_images(ctx context.Context, fiel } res := resTmp.([]*Image) fc.Result = res - return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImageᚄ(ctx, field.Selections, res) + return ec.marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, field.Selections, res) } func (ec *executionContext) _Tag_id(ctx context.Context, field graphql.CollectedField, obj *Tag) (ret graphql.Marshaler) { @@ -33646,7 +33646,7 @@ func (ec *executionContext) unmarshalOIDCriterionInput2ᚖgithubᚗcomᚋstashap return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImageᚄ(ctx context.Context, sel ast.SelectionSet, v []*Image) graphql.Marshaler { +func (ec *executionContext) marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx context.Context, sel ast.SelectionSet, v []*Image) graphql.Marshaler { if v == nil { return graphql.Null } @@ -33673,7 +33673,7 @@ func (ec *executionContext) marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstash if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNImage2ᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, sel, v[i]) + ret[i] = ec.marshalOImage2ᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐImage(ctx, sel, v[i]) } if isLen1 { f(i) @@ -33684,12 +33684,6 @@ func (ec *executionContext) marshalOImage2ᚕᚖgithubᚗcomᚋstashappᚋstash } wg.Wait() - for _, e := range ret { - if e == graphql.Null { - return graphql.Null - } - } - return ret }