Scene Drafts can now get multiple links

frontend/src/graphql/queries/Draft.gql

@@ -2,7 +2,6 @@
 #import "../fragments/PerformerFragment.gql"
 #import "../fragments/TagFragment.gql"
 #import "../fragments/StudioFragment.gql"
-#import "../fragments/URLFragment.gql"
 query Draft($id: ID!) {
   findDraft(id: $id) {
     id
@@ -39,9 +38,7 @@ query Draft($id: ID!) {
         details
         director
         date
-        url {
-          ...URLFragment
-        }
+        urls
         studio {
           ... on Studio {
             ...StudioFragment

frontend/src/graphql/types.ts

@@ -1356,7 +1356,7 @@ export type SceneDraft = {
   studio?: Maybe<SceneDraftStudio>;
   tags?: Maybe<Array<SceneDraftTag>>;
   title?: Maybe<Scalars["String"]>;
-  url?: Maybe<Url>;
+  urls?: Maybe<Array<Scalars["String"]>>;
 };
 
 export type SceneDraftInput = {
@@ -1371,7 +1371,9 @@ export type SceneDraftInput = {
   studio?: InputMaybe<DraftEntityInput>;
   tags?: InputMaybe<Array<DraftEntityInput>>;
   title?: InputMaybe<Scalars["String"]>;
+  /** @deprecated Use urls field instead. */
   url?: InputMaybe<Scalars["String"]>;
+  urls?: InputMaybe<Array<Scalars["String"]>>;
 };
 
 export type SceneDraftPerformer = DraftEntity | Performer;
@@ -13953,16 +13955,7 @@ export type DraftQuery = {
           details?: string | null;
           director?: string | null;
           date?: string | null;
-          url?: {
-            __typename: "URL";
-            url: string;
-            site: {
-              __typename: "Site";
-              id: string;
-              name: string;
-              icon: string;
-            };
-          } | null;
+          urls?: Array<string> | null;
           studio?:
             | {
                 __typename: "DraftEntity";
@@ -39404,19 +39397,7 @@ export const DraftDocument = {
                             },
                             {
                               kind: "Field",
-                              name: { kind: "Name", value: "url" },
-                              selectionSet: {
-                                kind: "SelectionSet",
-                                selections: [
-                                  {
-                                    kind: "FragmentSpread",
-                                    name: {
-                                      kind: "Name",
-                                      value: "URLFragment",
-                                    },
-                                  },
-                                ],
-                              },
+                              name: { kind: "Name", value: "urls" },
                             },
                             {
                               kind: "Field",

frontend/src/pages/drafts/parse.ts

@@ -22,7 +22,7 @@
 >["performers"][number];
 
 type URL = { url: string; site: { id: string } };
 const joinURLs = <T extends URL>(
   newURL: T | undefined | null,
   existingURLs: T[] | undefined
 ) =>
@@ -68,7 +68,7 @@
     date: draft.date,
     title: draft.title,
     details: draft.details,
-    urls: joinURLs(draft.url, existingScene?.urls),
+    urls: existingScene?.urls,
     studio: draft.studio?.__typename === "Studio" ? draft.studio : null,
     director: draft.director,
     code: draft.code,
@@ -105,6 +105,7 @@
         []
       )
       .join(", "),
+    Urls: (draft?.urls ?? []).join(", "),
     Tags: (draft.tags ?? [])
       .reduce<string[]>(
         (res, t) => (t.__typename === "DraftEntity" ? [...res, t.name] : res),

graphql/schema/types/scene.graphql

@@ -228,7 +228,7 @@ type SceneDraft {
   code: String
   details: String
   director: String
-  url: URL
+  urls: [String!]
   date: String
   studio: SceneDraftStudio
   performers: [SceneDraftPerformer!]!
@@ -243,7 +243,8 @@ input SceneDraftInput {
   code: String
   details: String
   director: String
-  url: String
+  url: String @deprecated(reason: "Use urls field instead.")
+  urls: [String!]
   date: String
   studio: DraftEntityInput
   performers: [DraftEntityInput!]!

pkg/api/resolver_model_scene_draft.go

@@ -2,11 +2,8 @@ package api
 
 import (
 	"context"
-	"regexp"
 
-	"github.com/gofrs/uuid"
 	"github.com/stashapp/stash-box/pkg/models"
-	"github.com/stashapp/stash-box/pkg/utils"
 )
 
 type sceneDraftResolver struct{ *Resolver }
@@ -108,50 +105,3 @@ func (r *sceneDraftResolver) Studio(ctx context.Context, obj *models.SceneDraft)
 	}
 	return nil, nil
 }
-
-func (r *sceneDraftResolver) URL(ctx context.Context, obj *models.SceneDraft) (*models.URL, error) {
-	if obj.URL == nil {
-		return nil, nil
-	}
-
-	fac := r.getRepoFactory(ctx)
-	qb := fac.Site()
-	sites, _, err := qb.Query()
-	if err != nil {
-		return nil, nil
-	}
-	var studioSiteID *uuid.UUID
-	var siteID *uuid.UUID
-	for _, site := range sites {
-		// Skip any sites not valid for scenes
-		if !utils.Includes(site.ValidTypes, models.ValidSiteTypeEnumScene.String()) {
-			continue
-		}
-
-		if site.Name == "Studio" {
-			studioSiteID = &site.ID
-			continue
-		}
-
-		if site.Regex.Valid {
-			re, err := regexp.Compile(site.Regex.String)
-			if err == nil && re.MatchString(*obj.URL) {
-				siteID = &site.ID
-				break
-			}
-		}
-	}
-
-	if siteID == nil && studioSiteID != nil {
-		siteID = studioSiteID
-	}
-
-	if siteID != nil {
-		url := models.URL{
-			URL:    *obj.URL,
-			SiteID: *siteID,
-		}
-		return &url, nil
-	}
-	return nil, nil
-}

pkg/api/resolver_mutation_draft.go

@@ -26,7 +26,7 @@ func (r *mutationResolver) SubmitSceneDraft(ctx context.Context, input models.Sc
 		Code:         input.Code,
 		Details:      input.Details,
 		Director:     input.Director,
-		URL:          input.URL,
+		URLs:         input.Urls,
 		Date:         input.Date,
 		Studio:       translateDraftEntity(input.Studio),
 		Performers:   translateDraftEntitySlice(input.Performers),
@@ -56,6 +56,11 @@ func (r *mutationResolver) SubmitSceneDraft(ctx context.Context, input models.Sc
 			data.Tags = tags
 		}
 
+		// Temporary code, while we depreciate the URL parameter.
+		if input.URL != nil {
+			data.URLs = []string{*input.URL}
+		}
+
 		if err := newDraft.SetData(data); err != nil {
 			return err
 		}

pkg/models/model_draft.go

@@ -32,7 +32,7 @@ type SceneDraft struct {
 	Code         *string            `json:"code,omitempty"`
 	Details      *string            `json:"details,omitempty"`
 	Director     *string            `json:"director,omitempty"`
-	URL          *string            `json:"url,omitempty"`
+	URLs         []string           `json:"urls,omitempty"`
 	Date         *string            `json:"date,omitempty"`
 	Studio       *DraftEntity       `json:"studio,omitempty"`
 	Performers   []DraftEntity      `json:"performers,omitempty"`