From f0269889c03cf763b514680ee905f67a4414814e Mon Sep 17 00:00:00 2001 From: Anthony Wang Date: Mon, 5 Sep 2022 16:37:56 -0500 Subject: [PATCH] Fix build errors --- modules/activitypub/repo.go | 4 ++-- routers/api/v1/activitypub/person.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/activitypub/repo.go b/modules/activitypub/repo.go index 7f7eeceb1f..42638da205 100644 --- a/modules/activitypub/repo.go +++ b/modules/activitypub/repo.go @@ -7,8 +7,8 @@ package activitypub import ( "context" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/forgefed" + repo_module "code.gitea.io/gitea/modules/repository" repo_service "code.gitea.io/gitea/services/repository" ) @@ -21,7 +21,7 @@ func FederatedRepoNew(ctx context.Context, repository *forgefed.Repository) erro } // TODO: Check if repo already exists - repo, err := repo_service.CreateRepository(user, user, models.CreateRepoOptions{ + repo, err := repo_service.CreateRepository(user, user, repo_module.CreateRepoOptions{ Name: repository.Name.String(), }) if err != nil { diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index 73b856f3b7..348629873b 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -10,7 +10,7 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" @@ -172,9 +172,9 @@ func PersonOutbox(ctx *context.APIContext) { outbox := ap.OrderedCollectionPageNew(orderedCollection) outbox.First = ap.IRI(link + "/outbox?page=1") - feed, err := models.GetFeeds(ctx, models.GetFeedsOptions{ + feed, err := activities.GetFeeds(ctx, activities.GetFeedsOptions{ RequestedUser: ctx.ContextUser, - RequestedActionType: models.ActionCreateRepo, + RequestedActionType: activities.ActionCreateRepo, Actor: ctx.Doer, IncludePrivate: false, IncludeDeleted: false,