From 36f3924b4f25bffc0f58d4a7ad2c34703cb5f113 Mon Sep 17 00:00:00 2001 From: Kostiantyn <32730812+kkovaletp@users.noreply.github.com> Date: Mon, 5 May 2025 18:14:59 +0300 Subject: [PATCH] Bump GQLgen, GQLparser and GORM versions in API (#1197) * Bump GQLparser and GORM versions in API * Bump GQLgen as well * Revert GORM update --------- Co-authored-by: Konstantin Koval --- api/go.mod | 4 ++-- api/go.sum | 8 ++++---- api/graphql/generated.go | 24 ++++++++++++++++++++++++ api/graphql/resolvers/album.go | 2 +- api/graphql/resolvers/faces.go | 2 +- api/graphql/resolvers/media.go | 2 +- api/graphql/resolvers/media_geo_json.go | 2 +- api/graphql/resolvers/notification.go | 2 +- api/graphql/resolvers/root.go | 2 +- api/graphql/resolvers/scanner.go | 2 +- api/graphql/resolvers/search.go | 2 +- api/graphql/resolvers/share_token.go | 2 +- api/graphql/resolvers/site_info.go | 2 +- api/graphql/resolvers/thumbnails.go | 2 +- api/graphql/resolvers/timeline.go | 2 +- api/graphql/resolvers/user.go | 2 +- 16 files changed, 43 insertions(+), 19 deletions(-) diff --git a/api/go.mod b/api/go.mod index 3a733083..8259faf8 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,7 +3,7 @@ module github.com/photoview/photoview/api go 1.24.0 require ( - github.com/99designs/gqlgen v0.17.72 + github.com/99designs/gqlgen v0.17.73 github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e github.com/barasher/go-exiftool v1.10.0 github.com/buckket/go-blurhash v1.1.0 @@ -20,7 +20,7 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/stretchr/testify v1.10.0 github.com/strukturag/libheif v1.18.2 - github.com/vektah/gqlparser/v2 v2.5.25 + github.com/vektah/gqlparser/v2 v2.5.26 github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 github.com/xor-gate/goexif2 v1.1.0 golang.org/x/crypto v0.37.0 diff --git a/api/go.sum b/api/go.sum index 942a57f3..05bf2ff9 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,7 +1,7 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -github.com/99designs/gqlgen v0.17.72 h1:2JDAuutIYtAN26BAtigfLZFnTN53fpYbIENL8bVgAKY= -github.com/99designs/gqlgen v0.17.72/go.mod h1:BoL4C3j9W2f95JeWMrSArdDNGWmZB9MOS2EMHJDZmUc= +github.com/99designs/gqlgen v0.17.73 h1:A3Ki+rHWqKbAOlg5fxiZBnz6OjW3nwupDHEG15gEsrg= +github.com/99designs/gqlgen v0.17.73/go.mod h1:2RyGWjy2k7W9jxrs8MOQthXGkD3L3oGr0jXW3Pu8lGg= github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e h1:lqIUFzxaqyYqUn4MhzAvSAh4wIte/iLNcIEWxpT/qbc= github.com/Kagami/go-face v0.0.0-20210630145111-0c14797b4d0e/go.mod h1:9wdDJkRgo3SGTcFwbQ7elVIQhIr2bbBjecuY7VoqmPU= github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo= @@ -97,8 +97,8 @@ github.com/strukturag/libheif v1.18.2 h1:CrlRS7Kwl2odl4DYM/m6ay/HPXEcmQPK1xF8FxA github.com/strukturag/libheif v1.18.2/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks= github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g= github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ= -github.com/vektah/gqlparser/v2 v2.5.25 h1:FmWtFEa+invTIzWlWK6Vk7BVEZU/97QBzeI8Z1JjGt8= -github.com/vektah/gqlparser/v2 v2.5.25/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo= +github.com/vektah/gqlparser/v2 v2.5.26 h1:REqqFkO8+SOEgZHR/eHScjjVjGS8Nk3RMO/juiTobN4= +github.com/vektah/gqlparser/v2 v2.5.26/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo= github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 h1:3UeQBvD0TFrlVjOeLOBz+CPAI8dnbqNSVwUwRrkp7vQ= github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0/go.mod h1:IXCdmsXIht47RaVFLEdVnh1t+pgYtTAhQGj73kz+2DM= github.com/xor-gate/goexif2 v1.1.0 h1:OvTZ5iEvsDhRWFjV5xY3wT7uHFna28nSSP7ucau+cXQ= diff --git a/api/graphql/generated.go b/api/graphql/generated.go index a9e699cc..1b0e82a4 100644 --- a/api/graphql/generated.go +++ b/api/graphql/generated.go @@ -18069,6 +18069,7 @@ func (ec *executionContext) marshalNAny2interface(ctx context.Context, sel ast.S } return graphql.Null } + _ = sel res := graphql.MarshalAny(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18098,6 +18099,7 @@ func (ec *executionContext) unmarshalNBoolean2bool(ctx context.Context, v any) ( } func (ec *executionContext) marshalNBoolean2bool(ctx context.Context, sel ast.SelectionSet, v bool) graphql.Marshaler { + _ = sel res := graphql.MarshalBoolean(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18175,6 +18177,7 @@ func (ec *executionContext) unmarshalNFloat2float64(ctx context.Context, v any) } func (ec *executionContext) marshalNFloat2float64(ctx context.Context, sel ast.SelectionSet, v float64) graphql.Marshaler { + _ = sel res := graphql.MarshalFloatContext(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18190,6 +18193,7 @@ func (ec *executionContext) unmarshalNID2int(ctx context.Context, v any) (int, e } func (ec *executionContext) marshalNID2int(ctx context.Context, sel ast.SelectionSet, v int) graphql.Marshaler { + _ = sel res := graphql.MarshalIntID(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18289,6 +18293,7 @@ func (ec *executionContext) unmarshalNInt2int(ctx context.Context, v any) (int, } func (ec *executionContext) marshalNInt2int(ctx context.Context, sel ast.SelectionSet, v int) graphql.Marshaler { + _ = sel res := graphql.MarshalInt(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18304,6 +18309,7 @@ func (ec *executionContext) unmarshalNInt2int64(ctx context.Context, v any) (int } func (ec *executionContext) marshalNInt2int64(ctx context.Context, sel ast.SelectionSet, v int64) graphql.Marshaler { + _ = sel res := graphql.MarshalInt64(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18432,6 +18438,7 @@ func (ec *executionContext) unmarshalNMediaType2githubᚗcomᚋphotoviewᚋphoto } func (ec *executionContext) marshalNMediaType2githubᚗcomᚋphotoviewᚋphotoviewᚋapiᚋgraphqlᚋmodelsᚐMediaType(ctx context.Context, sel ast.SelectionSet, v models.MediaType) graphql.Marshaler { + _ = sel res := graphql.MarshalString(string(v)) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18586,6 +18593,7 @@ func (ec *executionContext) unmarshalNString2string(ctx context.Context, v any) } func (ec *executionContext) marshalNString2string(ctx context.Context, sel ast.SelectionSet, v string) graphql.Marshaler { + _ = sel res := graphql.MarshalString(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18611,6 +18619,7 @@ func (ec *executionContext) unmarshalNTime2timeᚐTime(ctx context.Context, v an } func (ec *executionContext) marshalNTime2timeᚐTime(ctx context.Context, sel ast.SelectionSet, v time.Time) graphql.Marshaler { + _ = sel res := graphql.MarshalTime(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18746,6 +18755,7 @@ func (ec *executionContext) unmarshalN__DirectiveLocation2string(ctx context.Con } func (ec *executionContext) marshalN__DirectiveLocation2string(ctx context.Context, sel ast.SelectionSet, v string) graphql.Marshaler { + _ = sel res := graphql.MarshalString(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18934,6 +18944,7 @@ func (ec *executionContext) unmarshalN__TypeKind2string(ctx context.Context, v a } func (ec *executionContext) marshalN__TypeKind2string(ctx context.Context, sel ast.SelectionSet, v string) graphql.Marshaler { + _ = sel res := graphql.MarshalString(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -18963,6 +18974,8 @@ func (ec *executionContext) unmarshalOBoolean2bool(ctx context.Context, v any) ( } func (ec *executionContext) marshalOBoolean2bool(ctx context.Context, sel ast.SelectionSet, v bool) graphql.Marshaler { + _ = sel + _ = ctx res := graphql.MarshalBoolean(v) return res } @@ -18979,6 +18992,8 @@ func (ec *executionContext) marshalOBoolean2ᚖbool(ctx context.Context, sel ast if v == nil { return graphql.Null } + _ = sel + _ = ctx res := graphql.MarshalBoolean(*v) return res } @@ -19002,6 +19017,7 @@ func (ec *executionContext) marshalOFloat2ᚖfloat64(ctx context.Context, sel as if v == nil { return graphql.Null } + _ = sel res := graphql.MarshalFloatContext(*v) return graphql.WrapContextMarshaler(ctx, res) } @@ -19018,6 +19034,8 @@ func (ec *executionContext) marshalOInt2ᚖint(ctx context.Context, sel ast.Sele if v == nil { return graphql.Null } + _ = sel + _ = ctx res := graphql.MarshalInt(*v) return res } @@ -19034,6 +19052,8 @@ func (ec *executionContext) marshalOInt2ᚖint64(ctx context.Context, sel ast.Se if v == nil { return graphql.Null } + _ = sel + _ = ctx res := graphql.MarshalInt64(*v) return res } @@ -19127,6 +19147,8 @@ func (ec *executionContext) marshalOString2ᚖstring(ctx context.Context, sel as if v == nil { return graphql.Null } + _ = sel + _ = ctx res := graphql.MarshalString(*v) return res } @@ -19143,6 +19165,8 @@ func (ec *executionContext) marshalOTime2ᚖtimeᚐTime(ctx context.Context, sel if v == nil { return graphql.Null } + _ = sel + _ = ctx res := graphql.MarshalTime(*v) return res } diff --git a/api/graphql/resolvers/album.go b/api/graphql/resolvers/album.go index 1588b350..2a8cbb01 100644 --- a/api/graphql/resolvers/album.go +++ b/api/graphql/resolvers/album.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/faces.go b/api/graphql/resolvers/faces.go index 2bdc0349..d8b2eebb 100644 --- a/api/graphql/resolvers/faces.go +++ b/api/graphql/resolvers/faces.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/media.go b/api/graphql/resolvers/media.go index 9c1cbad2..091d920d 100644 --- a/api/graphql/resolvers/media.go +++ b/api/graphql/resolvers/media.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/media_geo_json.go b/api/graphql/resolvers/media_geo_json.go index f4ba60db..c4896e5f 100644 --- a/api/graphql/resolvers/media_geo_json.go +++ b/api/graphql/resolvers/media_geo_json.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/notification.go b/api/graphql/resolvers/notification.go index afbc9c4b..3b0ba3d4 100644 --- a/api/graphql/resolvers/notification.go +++ b/api/graphql/resolvers/notification.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/root.go b/api/graphql/resolvers/root.go index cb971e2f..c46b666d 100644 --- a/api/graphql/resolvers/root.go +++ b/api/graphql/resolvers/root.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( api "github.com/photoview/photoview/api/graphql" diff --git a/api/graphql/resolvers/scanner.go b/api/graphql/resolvers/scanner.go index 01c0ae6c..89c1b17b 100644 --- a/api/graphql/resolvers/scanner.go +++ b/api/graphql/resolvers/scanner.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/search.go b/api/graphql/resolvers/search.go index 2106f047..30c0826f 100644 --- a/api/graphql/resolvers/search.go +++ b/api/graphql/resolvers/search.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/share_token.go b/api/graphql/resolvers/share_token.go index e32d48d1..fac110d8 100644 --- a/api/graphql/resolvers/share_token.go +++ b/api/graphql/resolvers/share_token.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/site_info.go b/api/graphql/resolvers/site_info.go index b76d2389..57e8290d 100644 --- a/api/graphql/resolvers/site_info.go +++ b/api/graphql/resolvers/site_info.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/thumbnails.go b/api/graphql/resolvers/thumbnails.go index 1b700133..f5647cbe 100644 --- a/api/graphql/resolvers/thumbnails.go +++ b/api/graphql/resolvers/thumbnails.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/timeline.go b/api/graphql/resolvers/timeline.go index bdfc9b5a..07b4e7f2 100644 --- a/api/graphql/resolvers/timeline.go +++ b/api/graphql/resolvers/timeline.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context" diff --git a/api/graphql/resolvers/user.go b/api/graphql/resolvers/user.go index 3a304cfa..2dd38b7c 100644 --- a/api/graphql/resolvers/user.go +++ b/api/graphql/resolvers/user.go @@ -2,7 +2,7 @@ package resolvers // This file will be automatically regenerated based on the schema, any resolver implementations // will be copied through when generating and any unknown code will be moved to the end. -// Code generated by github.com/99designs/gqlgen version v0.17.72 +// Code generated by github.com/99designs/gqlgen version v0.17.73 import ( "context"