From d909c97da96e0a061dcc8d9d42632005ec853e65 Mon Sep 17 00:00:00 2001 From: Anthony Wang Date: Wed, 27 Jul 2022 10:25:40 -0500 Subject: [PATCH] Move models/forgefed to modules/forgefed --- modules/activitypub/authorize_interaction.go | 2 +- modules/activitypub/fork.go | 4 ++-- modules/activitypub/issue.go | 2 +- modules/activitypub/pull_request.go | 2 +- modules/activitypub/repo.go | 2 +- modules/activitypub/transport.go | 2 +- {models => modules}/forgefed/branch.go | 0 {models => modules}/forgefed/commit.go | 0 {models => modules}/forgefed/forgefed.go | 0 {models => modules}/forgefed/push.go | 0 {models => modules}/forgefed/repository.go | 0 {models => modules}/forgefed/repository_test.go | 0 {models => modules}/forgefed/ticket.go | 0 routers/api/v1/activitypub/person.go | 2 +- routers/api/v1/activitypub/repo.go | 2 +- routers/api/v1/activitypub/response.go | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename {models => modules}/forgefed/branch.go (100%) rename {models => modules}/forgefed/commit.go (100%) rename {models => modules}/forgefed/forgefed.go (100%) rename {models => modules}/forgefed/push.go (100%) rename {models => modules}/forgefed/repository.go (100%) rename {models => modules}/forgefed/repository_test.go (100%) rename {models => modules}/forgefed/ticket.go (100%) diff --git a/modules/activitypub/authorize_interaction.go b/modules/activitypub/authorize_interaction.go index 61a63f7c23..751f267ade 100644 --- a/modules/activitypub/authorize_interaction.go +++ b/modules/activitypub/authorize_interaction.go @@ -8,8 +8,8 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/forgefed" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/forgefed" ap "github.com/go-ap/activitypub" ) diff --git a/modules/activitypub/fork.go b/modules/activitypub/fork.go index aa0893dd0f..118f88d585 100644 --- a/modules/activitypub/fork.go +++ b/modules/activitypub/fork.go @@ -7,9 +7,9 @@ package activitypub import ( "context" - "code.gitea.io/gitea/models/forgefed" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/services/migrations" repo_service "code.gitea.io/gitea/services/repository" @@ -49,7 +49,7 @@ func CreateFork(ctx context.Context, instance, username, reponame, destUsername func ReceiveFork(ctx context.Context, create ap.Create) error { // TODO: Clean this up - + repository := create.Object.(*forgefed.Repository) actor, err := personIRIToUser(ctx, create.Actor.GetLink()) diff --git a/modules/activitypub/issue.go b/modules/activitypub/issue.go index 3f875155b5..e1dd0b787d 100644 --- a/modules/activitypub/issue.go +++ b/modules/activitypub/issue.go @@ -7,7 +7,7 @@ package activitypub import ( "context" - "code.gitea.io/gitea/models/forgefed" + "code.gitea.io/gitea/modules/forgefed" ) // Create an issue diff --git a/modules/activitypub/pull_request.go b/modules/activitypub/pull_request.go index 2e1f61c073..aefda8da33 100644 --- a/modules/activitypub/pull_request.go +++ b/modules/activitypub/pull_request.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "code.gitea.io/gitea/models/forgefed" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/log" pull_service "code.gitea.io/gitea/services/pull" ) diff --git a/modules/activitypub/repo.go b/modules/activitypub/repo.go index 821cfd8963..6f4f066f89 100644 --- a/modules/activitypub/repo.go +++ b/modules/activitypub/repo.go @@ -6,7 +6,7 @@ package activitypub import ( //"code.gitea.io/gitea/models" - "code.gitea.io/gitea/models/forgefed" + "code.gitea.io/gitea/modules/forgefed" /*repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/repository" diff --git a/modules/activitypub/transport.go b/modules/activitypub/transport.go index 4ac2a63d6f..2a48750242 100644 --- a/modules/activitypub/transport.go +++ b/modules/activitypub/transport.go @@ -10,8 +10,8 @@ import ( "net/http" "net/url" - "code.gitea.io/gitea/models/forgefed" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/httplib" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/models/forgefed/branch.go b/modules/forgefed/branch.go similarity index 100% rename from models/forgefed/branch.go rename to modules/forgefed/branch.go diff --git a/models/forgefed/commit.go b/modules/forgefed/commit.go similarity index 100% rename from models/forgefed/commit.go rename to modules/forgefed/commit.go diff --git a/models/forgefed/forgefed.go b/modules/forgefed/forgefed.go similarity index 100% rename from models/forgefed/forgefed.go rename to modules/forgefed/forgefed.go diff --git a/models/forgefed/push.go b/modules/forgefed/push.go similarity index 100% rename from models/forgefed/push.go rename to modules/forgefed/push.go diff --git a/models/forgefed/repository.go b/modules/forgefed/repository.go similarity index 100% rename from models/forgefed/repository.go rename to modules/forgefed/repository.go diff --git a/models/forgefed/repository_test.go b/modules/forgefed/repository_test.go similarity index 100% rename from models/forgefed/repository_test.go rename to modules/forgefed/repository_test.go diff --git a/models/forgefed/ticket.go b/modules/forgefed/ticket.go similarity index 100% rename from models/forgefed/ticket.go rename to modules/forgefed/ticket.go diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index a78368c68e..0280a0376b 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -11,11 +11,11 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/forgefed" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/activitypub" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/api/v1/utils" diff --git a/routers/api/v1/activitypub/repo.go b/routers/api/v1/activitypub/repo.go index 188bda2037..070ab7d814 100644 --- a/routers/api/v1/activitypub/repo.go +++ b/routers/api/v1/activitypub/repo.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" - "code.gitea.io/gitea/models/forgefed" "code.gitea.io/gitea/modules/activitypub" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" diff --git a/routers/api/v1/activitypub/response.go b/routers/api/v1/activitypub/response.go index d6a6ef68a1..bec876d6d9 100644 --- a/routers/api/v1/activitypub/response.go +++ b/routers/api/v1/activitypub/response.go @@ -7,9 +7,9 @@ package activitypub import ( "net/http" - "code.gitea.io/gitea/models/forgefed" "code.gitea.io/gitea/modules/activitypub" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/log" ap "github.com/go-ap/activitypub"