diff --git a/go.mod b/go.mod index 9b8d2863d8..3fd6e06494 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.18 require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 - gitea.com/Ta180m/activitypub v0.0.0-20220711172827-b05423b54985 gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 @@ -29,6 +28,7 @@ require ( github.com/ethantkoenig/rupture v1.0.1 github.com/felixge/fgprof v0.9.2 github.com/gliderlabs/ssh v0.3.4 + github.com/go-ap/activitypub v0.0.0-00010101000000-000000000000 github.com/go-ap/jsonld v0.0.0-20220615144122-1d862b15410d github.com/go-chi/chi/v5 v5.0.7 github.com/go-chi/cors v1.2.1 @@ -298,6 +298,8 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible +replace github.com/go-ap/activitypub => gitea.com/Ta180m/activitypub v0.0.0-20220711172827-b05423b54985 + exclude github.com/gofrs/uuid v3.2.0+incompatible exclude github.com/gofrs/uuid v4.0.0+incompatible diff --git a/integrations/api_activitypub_person_test.go b/integrations/api_activitypub_person_test.go index 7220efe7fa..e19da40864 100644 --- a/integrations/api_activitypub_person_test.go +++ b/integrations/api_activitypub_person_test.go @@ -17,7 +17,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" ) diff --git a/models/forgefed/branch.go b/models/forgefed/branch.go index a4519e39fb..d75d309d4e 100644 --- a/models/forgefed/branch.go +++ b/models/forgefed/branch.go @@ -5,7 +5,7 @@ package forgefed import ( - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/valyala/fastjson" ) diff --git a/models/forgefed/commit.go b/models/forgefed/commit.go index 9c13374408..70b5e2621a 100644 --- a/models/forgefed/commit.go +++ b/models/forgefed/commit.go @@ -7,7 +7,7 @@ package forgefed import ( "time" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/valyala/fastjson" ) diff --git a/models/forgefed/forgefed.go b/models/forgefed/forgefed.go index 865ddc28d5..73767b82d9 100644 --- a/models/forgefed/forgefed.go +++ b/models/forgefed/forgefed.go @@ -5,7 +5,7 @@ package forgefed import ( - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) // GetItemByType instantiates a new ForgeFed object if the type matches diff --git a/models/forgefed/push.go b/models/forgefed/push.go index 2995661249..edcdf837e3 100644 --- a/models/forgefed/push.go +++ b/models/forgefed/push.go @@ -5,7 +5,7 @@ package forgefed import ( - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/valyala/fastjson" ) diff --git a/models/forgefed/repository.go b/models/forgefed/repository.go index 9777ff250e..e85e793ae8 100644 --- a/models/forgefed/repository.go +++ b/models/forgefed/repository.go @@ -5,7 +5,7 @@ package forgefed import ( - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/valyala/fastjson" ) diff --git a/models/forgefed/repository_test.go b/models/forgefed/repository_test.go index ff5996ab25..4bf36a66ce 100644 --- a/models/forgefed/repository_test.go +++ b/models/forgefed/repository_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) func Test_GetItemByType(t *testing.T) { diff --git a/models/forgefed/ticket.go b/models/forgefed/ticket.go index 5860906684..fa988f5d41 100644 --- a/models/forgefed/ticket.go +++ b/models/forgefed/ticket.go @@ -7,7 +7,7 @@ package forgefed import ( "time" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/valyala/fastjson" ) diff --git a/modules/activitypub/follow.go b/modules/activitypub/follow.go index 3361ca57f8..919b697a8f 100644 --- a/modules/activitypub/follow.go +++ b/modules/activitypub/follow.go @@ -11,7 +11,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) func Follow(ctx context.Context, activity ap.Follow) { diff --git a/modules/activitypub/repo.go b/modules/activitypub/repo.go index 0552393045..20a5df2366 100644 --- a/modules/activitypub/repo.go +++ b/modules/activitypub/repo.go @@ -10,7 +10,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/repository" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) func FederatedRepoNew(user *user_model.User, name string, IRI ap.IRI) (*repo_model.Repository, error) { diff --git a/modules/activitypub/send.go b/modules/activitypub/send.go index c41d3e1dac..ead664fd14 100644 --- a/modules/activitypub/send.go +++ b/modules/activitypub/send.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) func Fetch(iri *url.URL) (b []byte, err error) { diff --git a/modules/activitypub/user.go b/modules/activitypub/user.go index 6104f8faa5..4b7d958b56 100644 --- a/modules/activitypub/user.go +++ b/modules/activitypub/user.go @@ -8,7 +8,7 @@ import ( "code.gitea.io/gitea/models/auth" user_model "code.gitea.io/gitea/models/user" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) func FederatedUserNew(name string, IRI ap.IRI) error { diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index d277beb1ad..03e9a7c597 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -19,7 +19,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/api/v1/utils" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) // Person function returns the Person actor for a user diff --git a/routers/api/v1/activitypub/repo.go b/routers/api/v1/activitypub/repo.go index 4b5486fef9..a3611776a7 100644 --- a/routers/api/v1/activitypub/repo.go +++ b/routers/api/v1/activitypub/repo.go @@ -17,7 +17,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/api/v1/utils" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" ) // Repo function diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go index 3d5f8f9d35..ff3280d954 100644 --- a/routers/api/v1/activitypub/reqsignature.go +++ b/routers/api/v1/activitypub/reqsignature.go @@ -16,7 +16,7 @@ import ( gitea_context "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/go-fed/httpsig" ) diff --git a/routers/api/v1/activitypub/response.go b/routers/api/v1/activitypub/response.go index b0894db341..fb14653523 100644 --- a/routers/api/v1/activitypub/response.go +++ b/routers/api/v1/activitypub/response.go @@ -11,7 +11,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - ap "gitea.com/Ta180m/activitypub" + ap "github.com/go-ap/activitypub" "github.com/go-ap/jsonld" )