diff --git a/appview/indexer/repos/indexer.go b/appview/indexer/repos/indexer.go index 41088300..3e21f8aa 100644 --- a/appview/indexer/repos/indexer.go +++ b/appview/indexer/repos/indexer.go @@ -309,7 +309,6 @@ func (ix *Indexer) Search(ctx context.Context, opts models.RepoSearchOptions) (* for _, keyword := range opts.NegatedKeywords { mustNots = append(mustNots, bleve.NewDisjunctionQuery( bleveutil.MatchAndQuery("name", keyword, repoIndexerAnalyzer, 0), - bleveutil.MatchAndQuery("name_trigram", keyword, "trigram", 0), bleveutil.MatchAndQuery("description", keyword, repoIndexerAnalyzer, 0), bleveutil.MatchAndQuery("website", keyword, repoIndexerAnalyzer, 0), bleveutil.MatchAndQuery("topics", keyword, repoIndexerAnalyzer, 0), diff --git a/appview/issues/issues.go b/appview/issues/issues.go index 48727193..49305217 100644 --- a/appview/issues/issues.go +++ b/appview/issues/issues.go @@ -23,7 +23,6 @@ import ( "tangled.org/core/appview/models" "tangled.org/core/appview/notify" "tangled.org/core/appview/oauth" - "tangled.org/core/ogre" "tangled.org/core/appview/pages" "tangled.org/core/appview/pages/repoinfo" "tangled.org/core/appview/pagination" @@ -31,6 +30,7 @@ import ( "tangled.org/core/appview/searchquery" "tangled.org/core/appview/validator" "tangled.org/core/idresolver" + "tangled.org/core/ogre" "tangled.org/core/orm" "tangled.org/core/rbac" "tangled.org/core/tid" @@ -49,7 +49,7 @@ type Issues struct { logger *slog.Logger validator *validator.Validator indexer *issues_indexer.Indexer - ogreClient *ogre.Client + ogreClient *ogre.Client } func New( @@ -79,7 +79,7 @@ func New( logger: logger, validator: validator, indexer: indexer, - ogreClient: ogre.NewClient(config.Ogre.Host), + ogreClient: ogre.NewClient(config.Ogre.Host), } } diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go index fbcb9f17..f79fac7f 100644 --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -26,7 +26,6 @@ import ( "tangled.org/core/appview/models" "tangled.org/core/appview/notify" "tangled.org/core/appview/oauth" - "tangled.org/core/ogre" "tangled.org/core/appview/pages" "tangled.org/core/appview/pages/markup" "tangled.org/core/appview/pages/repoinfo" @@ -36,6 +35,7 @@ import ( "tangled.org/core/appview/validator" "tangled.org/core/appview/xrpcclient" "tangled.org/core/idresolver" + "tangled.org/core/ogre" "tangled.org/core/orm" "tangled.org/core/patchutil" "tangled.org/core/rbac" @@ -66,7 +66,7 @@ type Pulls struct { logger *slog.Logger validator *validator.Validator indexer *pulls_indexer.Indexer - ogreClient *ogre.Client + ogreClient *ogre.Client } func New( @@ -96,7 +96,7 @@ func New( logger: logger, validator: validator, indexer: indexer, - ogreClient: ogre.NewClient(config.Ogre.Host), + ogreClient: ogre.NewClient(config.Ogre.Host), } } diff --git a/appview/repo/repo.go b/appview/repo/repo.go index ac2eabc0..14e6eb78 100644 --- a/appview/repo/repo.go +++ b/appview/repo/repo.go @@ -20,13 +20,13 @@ import ( "tangled.org/core/appview/models" "tangled.org/core/appview/notify" "tangled.org/core/appview/oauth" - "tangled.org/core/ogre" "tangled.org/core/appview/pages" "tangled.org/core/appview/reporesolver" "tangled.org/core/appview/validator" xrpcclient "tangled.org/core/appview/xrpcclient" "tangled.org/core/eventconsumer" "tangled.org/core/idresolver" + "tangled.org/core/ogre" "tangled.org/core/orm" "tangled.org/core/rbac" "tangled.org/core/tid" @@ -54,7 +54,7 @@ type Repo struct { serviceAuth *serviceauth.ServiceAuth validator *validator.Validator cfClient *cloudflare.Client - ogreClient *ogre.Client + ogreClient *ogre.Client } func New( @@ -84,7 +84,7 @@ func New( logger: logger, validator: validator, cfClient: cfClient, - ogreClient: ogre.NewClient(config.Ogre.Host), + ogreClient: ogre.NewClient(config.Ogre.Host), } }