From dd40c07a6d332b506dc0825fe5a2d084397a545d Mon Sep 17 00:00:00 2001 From: 81hvac1k02 <125800300+81hvac1k02@users.noreply.github.com> Date: Thu, 6 Feb 2025 03:35:08 +0100 Subject: [PATCH] removed un-necesarry dependancy (#5641) --- go.mod | 3 +-- go.sum | 2 -- pkg/scraper/stashbox/stash_box.go | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6f2f802517d..cc5af561eb5 100644 --- a/go.mod +++ b/go.mod @@ -19,9 +19,9 @@ require ( github.com/go-chi/cors v1.2.1 github.com/go-chi/httplog v0.3.1 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 - github.com/gofrs/uuid/v5 v5.1.0 github.com/golang-jwt/jwt/v4 v4.5.1 github.com/golang-migrate/migrate/v4 v4.16.2 + github.com/google/uuid v1.6.0 github.com/gorilla/securecookie v1.1.1 github.com/gorilla/sessions v1.2.1 github.com/gorilla/websocket v1.5.0 @@ -78,7 +78,6 @@ require ( github.com/gobwas/ws v1.3.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect diff --git a/go.sum b/go.sum index 24fe07cb590..3ae58c84ab3 100644 --- a/go.sum +++ b/go.sum @@ -244,8 +244,6 @@ github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/K github.com/gobwas/ws v1.3.0 h1:sbeU3Y4Qzlb+MOzIe6mQGf7QR4Hkv6ZD0qhGkBFL2O0= github.com/gobwas/ws v1.3.0/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid/v5 v5.1.0 h1:S5rqVKIigghZTCBKPCw0Y+bXkn26K3TB5mvQq2Ix8dk= -github.com/gofrs/uuid/v5 v5.1.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= diff --git a/pkg/scraper/stashbox/stash_box.go b/pkg/scraper/stashbox/stash_box.go index 670ec95980b..e6667fcf881 100644 --- a/pkg/scraper/stashbox/stash_box.go +++ b/pkg/scraper/stashbox/stash_box.go @@ -15,7 +15,7 @@ import ( "github.com/Yamashou/gqlgenc/clientv2" "github.com/Yamashou/gqlgenc/graphqljson" - "github.com/gofrs/uuid/v5" + "github.com/google/uuid" "golang.org/x/text/cases" "golang.org/x/text/language" @@ -890,7 +890,7 @@ func (c Client) FindStashBoxPerformerByName(ctx context.Context, name string) (* func (c Client) FindStashBoxStudio(ctx context.Context, query string) (*models.ScrapedStudio, error) { var studio *graphql.FindStudio - _, err := uuid.FromString(query) + _, err := uuid.Parse(query) if err == nil { // Confirmed the user passed in a Stash ID studio, err = c.client.FindStudio(ctx, &query, nil)