versia-pub/versia-go
2
0
Fork 0
mirror of https://github.com/versia-pub/versia-go.git synced 2025-12-06 14:28:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: bump deps

Browse source
This commit is contained in:
DevMiner 2024-08-27 01:26:40 +02:00
parent 0b489c1970
commit 601ecd1124
5 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
go.mod
View file

@ -4,7 +4,7 @@ go 1.22.5
require ( require (
entgo.io/ent v0.13.1 entgo.io/ent v0.13.1
git.devminer.xyz/devminer/unitel v0.0.0-20240824122754-a564b3351eda git.devminer.xyz/devminer/unitel v0.0.0-20240826235642-9dc9d99379d4
github.com/go-logr/logr v1.4.2 github.com/go-logr/logr v1.4.2
github.com/go-logr/zerologr v1.2.3 github.com/go-logr/zerologr v1.2.3
github.com/go-playground/locales v0.14.1 github.com/go-playground/locales v0.14.1
@ -75,8 +75,8 @@ require (
golang.org/x/sys v0.24.0 // indirect golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect golang.org/x/text v0.17.0 // indirect
golang.org/x/tools v0.23.0 // indirect golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/grpc v1.65.0 // indirect google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect

10
go.sum
View file

@ -6,6 +6,12 @@ git.devminer.xyz/devminer/unitel v0.0.0-20240822223836-a49c03bfb436 h1:AF2X1pJzN
git.devminer.xyz/devminer/unitel v0.0.0-20240822223836-a49c03bfb436/go.mod h1:RMbKTJgzMPNUCFCYEI36DntHnXrPYuItnVZZ8tMeLb0= git.devminer.xyz/devminer/unitel v0.0.0-20240822223836-a49c03bfb436/go.mod h1:RMbKTJgzMPNUCFCYEI36DntHnXrPYuItnVZZ8tMeLb0=
git.devminer.xyz/devminer/unitel v0.0.0-20240824122754-a564b3351eda h1:2zMxnYLKUCh2GKgX5yLvqQbcE5bi7fI7Ylx0XPS5QDU= git.devminer.xyz/devminer/unitel v0.0.0-20240824122754-a564b3351eda h1:2zMxnYLKUCh2GKgX5yLvqQbcE5bi7fI7Ylx0XPS5QDU=
git.devminer.xyz/devminer/unitel v0.0.0-20240824122754-a564b3351eda/go.mod h1:RMbKTJgzMPNUCFCYEI36DntHnXrPYuItnVZZ8tMeLb0= git.devminer.xyz/devminer/unitel v0.0.0-20240824122754-a564b3351eda/go.mod h1:RMbKTJgzMPNUCFCYEI36DntHnXrPYuItnVZZ8tMeLb0=
git.devminer.xyz/devminer/unitel v0.0.0-20240826232554-18125db23172 h1:+Fwx7Cl6qyaF1+6iaV8K8VOdYPQPZxhQ4DUPvVITMtM=
git.devminer.xyz/devminer/unitel v0.0.0-20240826232554-18125db23172/go.mod h1:RMbKTJgzMPNUCFCYEI36DntHnXrPYuItnVZZ8tMeLb0=
git.devminer.xyz/devminer/unitel v0.0.0-20240826233058-9856e2b795aa h1:wckFVfCdIoyaOGfFNxgZ9MqWO9RysUu0pEvg9HGjYgA=
git.devminer.xyz/devminer/unitel v0.0.0-20240826233058-9856e2b795aa/go.mod h1:RMbKTJgzMPNUCFCYEI36DntHnXrPYuItnVZZ8tMeLb0=
git.devminer.xyz/devminer/unitel v0.0.0-20240826235642-9dc9d99379d4 h1:i+v/Tos8pwZ7AQyW58Guf4Je+3GGw2LdJpI0a259Il0=
git.devminer.xyz/devminer/unitel v0.0.0-20240826235642-9dc9d99379d4/go.mod h1:RMbKTJgzMPNUCFCYEI36DntHnXrPYuItnVZZ8tMeLb0=
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
@ -232,10 +238,14 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd h1:
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g= google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g=
google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c h1:e0zB268kOca6FbuJkYUGxfwG4DKFZG/8DLyv9Zv66cE= google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c h1:e0zB268kOca6FbuJkYUGxfwG4DKFZG/8DLyv9Zv66cE=
google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g= google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g=
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw=
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd h1:6TEm2ZxXoQmFWFlt1vNxvVOa1Q0dXFQD1m/rYjXmS0E= google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd h1:6TEm2ZxXoQmFWFlt1vNxvVOa1Q0dXFQD1m/rYjXmS0E=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8= google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=

6
internal/repository/repo_impls/user_repository_impl.go
View file

@ -387,12 +387,12 @@ func (i *UserRepositoryImpl) LookupByURIs(ctx context.Context, uris []versiautil
return utils.MapErrorSlice(us, entity.NewUser) return utils.MapErrorSlice(us, entity.NewUser)
} }
func (i *UserRepositoryImpl) LookupByIDOrUsername(ctx context.Context, idOrUsername string) (*entity.User, error) { func (i *UserRepositoryImpl) LookupLocalByIDOrUsername(ctx context.Context, idOrUsername string) (*entity.User, error) {
s := i.telemetry.StartSpan(ctx, "function", "repo_impls/UserRepositoryImpl.LookupByIDOrUsername") s := i.telemetry.StartSpan(ctx, "function", "repo_impls/UserRepositoryImpl.LookupLocalByIDOrUsername")
defer s.End() defer s.End()
ctx = s.Context() ctx = s.Context()
var preds []predicate.User preds := []predicate.User{user.IsRemote(false)}
if u, err := uuid.Parse(idOrUsername); err == nil { if u, err := uuid.Parse(idOrUsername); err == nil {
preds = append(preds, user.IDEQ(u)) preds = append(preds, user.IDEQ(u))
} else { } else {

2
internal/repository/repository.go
View file

@ -25,7 +25,7 @@ type UserRepository interface {
LookupByURI(ctx context.Context, uri *versiautils.URL) (*entity.User, error) LookupByURI(ctx context.Context, uri *versiautils.URL) (*entity.User, error)
LookupByURIs(ctx context.Context, uris []versiautils.URL) ([]*entity.User, error) LookupByURIs(ctx context.Context, uris []versiautils.URL) ([]*entity.User, error)
LookupByIDOrUsername(ctx context.Context, idOrUsername string) (*entity.User, error) LookupLocalByIDOrUsername(ctx context.Context, idOrUsername string) (*entity.User, error)
} }
type FollowRepository interface { type FollowRepository interface {

4
internal/service/svc_impls/user_service_impl.go
View file

@ -77,7 +77,7 @@ func (i UserServiceImpl) GetUserByID(ctx context.Context, id uuid.UUID) (*entity
defer s.End() defer s.End()
ctx = s.Context() ctx = s.Context()
return i.repositories.Users().LookupByIDOrUsername(ctx, id.String()) return i.repositories.Users().GetByID(ctx, id)
} }
func (i UserServiceImpl) GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error) { func (i UserServiceImpl) GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error) {
@ -85,7 +85,7 @@ func (i UserServiceImpl) GetWebfingerForUser(ctx context.Context, userID string)
defer s.End() defer s.End()
ctx = s.Context() ctx = s.Context()
u, err := i.repositories.Users().LookupByIDOrUsername(ctx, userID) u, err := i.repositories.Users().LookupLocalByIDOrUsername(ctx, userID)
if err != nil { if err != nil {
return nil, err return nil, err
} }