patch of idresolver: move package out of appview · round #0 · pull #344 · tangled.org/core

+1 -1

appview/ingester.go

···

       14
       14
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       15
       15
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       16
       16
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       17
       17
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       18
       17
        
       	"tangled.sh/tangled.sh/core/appview/spindleverify"

     

       18
       18
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       20
       20
        
       )

     

       21
       21

+1 -1

appview/issues/issues.go

···

       18
       18
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       20
       20
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       21
       21
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       24
       23
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       25
       24
        
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       26
       25
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       26
       26
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       27
       27
        
       	"tangled.sh/tangled.sh/core/tid"

     

       28
       28
        
       )

     

       29
       29

+1 -1

appview/knots/knots.go

···

       15
       15
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       16
       16
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       17
       17
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       18
       18
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       19
       18
        
       	"tangled.sh/tangled.sh/core/appview/middleware"

     

       20
       19
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/eventconsumer"

     

       22
       22
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       23
       23
        
       	"tangled.sh/tangled.sh/core/knotclient"

     

       24
       24
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       25
       25
        
       	"tangled.sh/tangled.sh/core/tid"

+1 -1

appview/middleware/middleware.go

···

       13
       13
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       14
       14
        
       	"github.com/go-chi/chi/v5"

     

       15
       15
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       16
       16
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       17
       16
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       18
       17
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       19
       18
        
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       20
       19
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       20
       20
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       21
       21
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       22
       22
        
       )

     

       23
       23

+1 -1

appview/oauth/handler/handler.go

···

       16
       16
        
       	sessioncache "tangled.sh/tangled.sh/core/appview/cache/session"

     

       17
       17
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       18
       18
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       19
       19
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       20
       19
        
       	"tangled.sh/tangled.sh/core/appview/middleware"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/appview/oauth/client"

     

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       23
       23
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       24
       24
        
       	"tangled.sh/tangled.sh/core/knotclient"

     

       25
       25
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       26
       26
        
       )

+1 -1

appview/pipelines/pipelines.go

···

       11
       11
        
       

     

       12
       12
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       13
       13
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       14
       14
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       15
       14
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       16
       15
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       17
       16
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       18
       17
        
       	"tangled.sh/tangled.sh/core/eventconsumer"

     

       18
       18
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/log"

     

       20
       20
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       21
       21
        
       	spindlemodel "tangled.sh/tangled.sh/core/spindle/models"

+1 -1

appview/pulls/pulls.go

···

       16
       16
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       17
       17
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       18
       18
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       19
       19
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       20
       19
        
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       23
       23
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       24
       24
        
       	"tangled.sh/tangled.sh/core/knotclient"

     

       25
       25
        
       	"tangled.sh/tangled.sh/core/patchutil"

     

       26
       26
        
       	"tangled.sh/tangled.sh/core/tid"

+1 -1

appview/repo/repo.go

···

       19
       19
        
       	"tangled.sh/tangled.sh/core/appview/commitverify"

     

       20
       20
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       21
       21
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       22
       22
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       24
       23
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       25
       24
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       26
       25
        
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       27
       26
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       28
       27
        
       	"tangled.sh/tangled.sh/core/eventconsumer"

     

       28
       28
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       29
       29
        
       	"tangled.sh/tangled.sh/core/knotclient"

     

       30
       30
        
       	"tangled.sh/tangled.sh/core/patchutil"

     

       31
       31
        
       	"tangled.sh/tangled.sh/core/rbac"

+1 -1

appview/reporesolver/resolver.go

···

       17
       17
        
       	"github.com/go-chi/chi/v5"

     

       18
       18
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       20
       20
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/pages/repoinfo"

     

       23
       23
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       24
       24
        
       	"tangled.sh/tangled.sh/core/knotclient"

     

       25
       25
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       26
       26
        
       )

+1 -1

appview/spindles/spindles.go

···

       12
       12
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       13
       13
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       14
       14
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       15
       15
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       16
       15
        
       	"tangled.sh/tangled.sh/core/appview/middleware"

     

       17
       16
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       18
       17
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       19
       18
        
       	verify "tangled.sh/tangled.sh/core/appview/spindleverify"

     

       19
       19
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       20
       20
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       21
       21
        
       	"tangled.sh/tangled.sh/core/tid"

     

       22
       22

+2 -2

appview/state/state.go

···

       20
       20
        
       	"tangled.sh/tangled.sh/core/appview/cache/session"

     

       21
       21
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       22
       22
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       23
       23
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       24
       23
        
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       25
       24
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       26
       25
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       27
       26
        
       	posthog_service "tangled.sh/tangled.sh/core/appview/posthog"

     

       28
       27
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       29
       28
        
       	"tangled.sh/tangled.sh/core/eventconsumer"

     

       29
       29
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       30
       30
        
       	"tangled.sh/tangled.sh/core/jetstream"

     

       31
       31
        
       	"tangled.sh/tangled.sh/core/knotclient"

     

       32
       32
        
       	tlog "tangled.sh/tangled.sh/core/log"

     
···

       63
       63
        
       

     

       64
       64
        
       	pgs := pages.NewPages(config)

     

       65
       65
        
       

     

       66
       66
       -
       	res, err := idresolver.RedisResolver(config.Redis)

     

       66
       66
       +
       	res, err := idresolver.RedisResolver(config.Redis.ToURL())

     

       67
       67
        
       	if err != nil {

     

       68
       68
        
       		log.Printf("failed to create redis resolver: %v", err)

     

       69
       69
        
       		res = idresolver.DefaultResolver()

+1 -1

guard/guard.go

···

       13
       13
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       14
       14
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       15
       15
        
       	"github.com/urfave/cli/v3"

     

       16
       16
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       16
       16
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       17
       17
        
       	"tangled.sh/tangled.sh/core/log"

     

       18
       18
        
       )

     

       19
       19

+2 -3

appview/idresolver/resolver.go idresolver/resolver.go

···

       11
       11
        
       	"github.com/bluesky-social/indigo/atproto/identity/redisdir"

     

       12
       12
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       13
       13
        
       	"github.com/carlmjohnson/versioninfo"

     

       14
       14
       -
       	"tangled.sh/tangled.sh/core/appview/config"

     

       15
       14
        
       )

     

       16
       15
        
       

     

       17
       16
        
       type Resolver struct {

     
···

       56
       55
        
       	}

     

       57
       56
        
       }

     

       58
       57
        
       

     

       59
       59
       -
       func RedisResolver(config config.RedisConfig) (*Resolver, error) {

     

       60
       60
       -
       	directory, err := RedisDirectory(config.ToURL())

     

       58
       58
       +
       func RedisResolver(redisUrl string) (*Resolver, error) {

     

       59
       59
       +
       	directory, err := RedisDirectory(redisUrl)

     

       61
       60
        
       	if err != nil {

     

       62
       61
        
       		return nil, err

     

       63
       62
        
       	}

+1 -1

knotserver/ingester.go

···

       17
       17
        
       	"github.com/bluesky-social/jetstream/pkg/models"

     

       18
       18
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       20
       20
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       20
       20
       +
       	"tangled.sh/tangled.sh/core/idresolver"

     

       21
       21
        
       	"tangled.sh/tangled.sh/core/knotserver/db"

     

       22
       22
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     

       23
       23
        
       	"tangled.sh/tangled.sh/core/log"