From 2ec264ed62f051d857d7b8e14614203273300042 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 25 Mar 2025 11:19:14 +1100
Subject: [PATCH] Fix merge error

---
 pkg/scraper/stash.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/scraper/stash.go b/pkg/scraper/stash.go
index 5fa4ab259..5c5cab9fc 100644
--- a/pkg/scraper/stash.go
+++ b/pkg/scraper/stash.go
@@ -170,7 +170,7 @@ func (s *stashScraper) scrapeByPerformerFragment(ctx context.Context, scrapedPer
 	return &ret, nil
 }
 
-func (s *stashScraper) scrapeBySceneFragment(ctx context.Context, scrapedScene ScrapedSceneInput) (ScrapedContent, error) {
+func (s *stashScraper) scrapeBySceneFragment(ctx context.Context, scrapedScene models.ScrapedSceneInput) (ScrapedContent, error) {
 	client := s.getStashClient()
 
 	var q struct {
@@ -216,10 +216,10 @@ type scrapedStudioStash struct {
 
 type stashFindSceneNamesResultType struct {
 	Count  int                  `graphql:"count"`
-	Scenes []*ScrapedSceneStash `graphql:"scenes"`
+	Scenes []*scrapedSceneStash `graphql:"scenes"`
 }
 
-func (s *stashScraper) scrapedStashSceneToScrapedScene(ctx context.Context, scene *ScrapedSceneStash) (*models.ScrapedScene, error) {
+func (s *stashScraper) scrapedStashSceneToScrapedScene(ctx context.Context, scene *scrapedSceneStash) (*models.ScrapedScene, error) {
 	ret := models.ScrapedScene{}
 	err := copier.Copy(&ret, scene)
 	if err != nil {
@@ -329,7 +329,7 @@ func (f stashVideoFile) SceneFileType() models.SceneFileType {
 	return ret
 }
 
-type ScrapedSceneStash struct {
+type scrapedSceneStash struct {
 	ID         string                   `graphql:"id" json:"id"`
 	Title      *string                  `graphql:"title" json:"title"`
 	Details    *string                  `graphql:"details" json:"details"`
@@ -344,7 +344,7 @@ type ScrapedSceneStash struct {
 func (s *stashScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
 	// query by MD5
 	var q struct {
-		FindScene *ScrapedSceneStash `graphql:"findSceneByHash(input: $c)"`
+		FindScene *scrapedSceneStash `graphql:"findSceneByHash(input: $c)"`
 	}
 
 	type SceneHashInput struct {