TakeV
/
forgejo
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build errors

This commit is contained in:
Anthony Wang 2022-09-05 16:37:56 -05:00
parent ec1ffd66e3
commit f0269889c0
No known key found for this signature in database
GPG Key ID: 42A5B952E6DD8D38
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/activitypub/repo.go
View File

@ -7,8 +7,8 @@ package activitypub
import ( import (
"context" "context"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/forgefed"
repo_module "code.gitea.io/gitea/modules/repository"
repo_service "code.gitea.io/gitea/services/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 // 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(), Name: repository.Name.String(),
}) })
if err != nil { if err != nil {

6
routers/api/v1/activitypub/person.go
View File

@ -10,7 +10,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models/activities"
"code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
@ -172,9 +172,9 @@ func PersonOutbox(ctx *context.APIContext) {
outbox := ap.OrderedCollectionPageNew(orderedCollection) outbox := ap.OrderedCollectionPageNew(orderedCollection)
outbox.First = ap.IRI(link + "/outbox?page=1") 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, RequestedUser: ctx.ContextUser,
RequestedActionType: models.ActionCreateRepo, RequestedActionType: activities.ActionCreateRepo,
Actor: ctx.Doer, Actor: ctx.Doer,
IncludePrivate: false, IncludePrivate: false,
IncludeDeleted: false, IncludeDeleted: false,