From 7e48e0a9bebed113246e7883164c5d87eb936afb Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Wed, 5 Feb 2020 23:42:49 +0100 Subject: upgrade to gqlgen master, waiting for a release --- graphql/resolvers/identity.go | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) (limited to 'graphql/resolvers/identity.go') diff --git a/graphql/resolvers/identity.go b/graphql/resolvers/identity.go index ee40d4d8..da8e7b08 100644 --- a/graphql/resolvers/identity.go +++ b/graphql/resolvers/identity.go @@ -11,41 +11,10 @@ var _ graph.IdentityResolver = &identityResolver{} type identityResolver struct{} -func (identityResolver) ID(ctx context.Context, obj *identity.Interface) (string, error) { - return (*obj).Id().String(), nil +func (identityResolver) ID(ctx context.Context, obj identity.Interface) (string, error) { + return obj.Id().String(), nil } -func (identityResolver) HumanID(ctx context.Context, obj *identity.Interface) (string, error) { - return (*obj).Id().Human(), nil -} - -func (identityResolver) Name(ctx context.Context, obj *identity.Interface) (*string, error) { - return nilIfEmpty((*obj).Name()) -} - -func (identityResolver) Email(ctx context.Context, obj *identity.Interface) (*string, error) { - return nilIfEmpty((*obj).Email()) -} - -func (identityResolver) Login(ctx context.Context, obj *identity.Interface) (*string, error) { - return nilIfEmpty((*obj).Login()) -} - -func (identityResolver) DisplayName(ctx context.Context, obj *identity.Interface) (string, error) { - return (*obj).DisplayName(), nil -} - -func (identityResolver) AvatarURL(ctx context.Context, obj *identity.Interface) (*string, error) { - return nilIfEmpty((*obj).AvatarUrl()) -} - -func (identityResolver) IsProtected(ctx context.Context, obj *identity.Interface) (bool, error) { - return (*obj).IsProtected(), nil -} - -func nilIfEmpty(s string) (*string, error) { - if s == "" { - return nil, nil - } - return &s, nil +func (identityResolver) HumanID(ctx context.Context, obj identity.Interface) (string, error) { + return obj.Id().Human(), nil } -- cgit