From 559145d4345242fadafc2117af2f67e80f7c0717 Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Thu, 23 Jul 2026 15:36:08 +0900 Subject: [PATCH] repoverify: use `identity.Directory` over `idresolver.Resolver` Signed-off-by: Seongmin Lee --- appview/state/state.go | 2 +- repoverify/verify.go | 11 ++++++----- spindle/server.go | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/appview/state/state.go b/appview/state/state.go index dad7623b..e8939544 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -194,7 +194,7 @@ func Make(ctx context.Context, config *config.Config) (*State, error) { Logger: log.SubLogger(logger, "ingester"), MentionsResolver: mentionsResolver, Notifier: notifier, - Verifier: repoverify.New(res, config.Core.Dev), + Verifier: repoverify.New(res.Directory(), config.Core.Dev), } err = jc.StartJetstream(ctx, ingester.Ingest()) if err != nil { diff --git a/repoverify/verify.go b/repoverify/verify.go index 3eb74625..58b566b4 100644 --- a/repoverify/verify.go +++ b/repoverify/verify.go @@ -10,9 +10,10 @@ import ( "syscall" "time" + "github.com/bluesky-social/indigo/atproto/identity" + "github.com/bluesky-social/indigo/atproto/syntax" indigoxrpc "github.com/bluesky-social/indigo/xrpc" "tangled.org/core/api/tangled" - "tangled.org/core/idresolver" "tangled.org/core/repoident" "tangled.org/core/xrpc/xrpcclient" ) @@ -53,7 +54,7 @@ type Verifier func(ctx context.Context, repoDid repoident.RepoDid) (Result, erro const verifyTimeout = 10 * time.Second -func New(resolver *idresolver.Resolver, dev bool) Verifier { +func New(dir identity.Directory, dev bool) Verifier { transport := &http.Transport{ DialContext: safeDialer(dev).DialContext, } @@ -65,18 +66,18 @@ func New(resolver *idresolver.Resolver, dev bool) Verifier { return func(ctx context.Context, repoDid repoident.RepoDid) (Result, error) { ctx, cancel := context.WithTimeout(ctx, verifyTimeout) defer cancel() - return resolveAndDescribe(ctx, resolver, httpClient, repoDid, dev) + return resolveAndDescribe(ctx, dir, httpClient, repoDid, dev) } } func resolveAndDescribe( ctx context.Context, - resolver *idresolver.Resolver, + dir identity.Directory, httpClient *http.Client, repoDid repoident.RepoDid, dev bool, ) (Result, error) { - ident, err := resolver.ResolveIdent(ctx, repoDid.String()) + ident, err := dir.LookupDID(ctx, syntax.DID(repoDid)) if err != nil { return Result{}, fmt.Errorf("resolve repoDid %s: %w", repoDid, err) } diff --git a/spindle/server.go b/spindle/server.go index 77c47021..939a254b 100644 --- a/spindle/server.go +++ b/spindle/server.go @@ -156,7 +156,7 @@ func New(ctx context.Context, cfg *config.Config, d *db.DB, engines map[string]m engs: engines, cfg: cfg, res: resolver, - verify: repoverify.New(resolver, cfg.Server.Dev), + verify: repoverify.New(resolver.Directory(), cfg.Server.Dev), vault: vault, motd: defaultMotd, rootCtx: ctx, -- 2.51.2