Use a replace in go.mod to point to Ta180m/activitypub fork instead of modifying the include everywhere

This commit is contained in:
Anthony Wang 2022-07-11 17:27:57 -05:00
parent d016dbbe70
commit 79a59bd75b
No known key found for this signature in database
GPG Key ID: BC96B00AEC5F2D76
17 changed files with 19 additions and 17 deletions

4
go.mod
View File

@ -5,7 +5,6 @@ go 1.18
require ( require (
code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b
code.gitea.io/sdk/gitea v0.15.1 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/binding v0.0.0-20220309004920-114340dabecb
gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/cache v0.2.0
gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5
@ -29,6 +28,7 @@ require (
github.com/ethantkoenig/rupture v1.0.1 github.com/ethantkoenig/rupture v1.0.1
github.com/felixge/fgprof v0.9.2 github.com/felixge/fgprof v0.9.2
github.com/gliderlabs/ssh v0.3.4 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-ap/jsonld v0.0.0-20220615144122-1d862b15410d
github.com/go-chi/chi/v5 v5.0.7 github.com/go-chi/chi/v5 v5.0.7
github.com/go-chi/cors v1.2.1 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/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 v3.2.0+incompatible
exclude github.com/gofrs/uuid v4.0.0+incompatible exclude github.com/gofrs/uuid v4.0.0+incompatible

View File

@ -17,7 +17,7 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers"
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

View File

@ -5,7 +5,7 @@
package forgefed package forgefed
import ( import (
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/valyala/fastjson" "github.com/valyala/fastjson"
) )

View File

@ -7,7 +7,7 @@ package forgefed
import ( import (
"time" "time"
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/valyala/fastjson" "github.com/valyala/fastjson"
) )

View File

@ -5,7 +5,7 @@
package forgefed package forgefed
import ( import (
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
) )
// GetItemByType instantiates a new ForgeFed object if the type matches // GetItemByType instantiates a new ForgeFed object if the type matches

View File

@ -5,7 +5,7 @@
package forgefed package forgefed
import ( import (
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/valyala/fastjson" "github.com/valyala/fastjson"
) )

View File

@ -5,7 +5,7 @@
package forgefed package forgefed
import ( import (
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/valyala/fastjson" "github.com/valyala/fastjson"
) )

View File

@ -6,7 +6,7 @@ import (
"reflect" "reflect"
"testing" "testing"
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
) )
func Test_GetItemByType(t *testing.T) { func Test_GetItemByType(t *testing.T) {

View File

@ -7,7 +7,7 @@ package forgefed
import ( import (
"time" "time"
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/valyala/fastjson" "github.com/valyala/fastjson"
) )

View File

@ -11,7 +11,7 @@ import (
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log" "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) { func Follow(ctx context.Context, activity ap.Follow) {

View File

@ -10,7 +10,7 @@ import (
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/repository" "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) { func FederatedRepoNew(user *user_model.User, name string, IRI ap.IRI) (*repo_model.Repository, error) {

View File

@ -16,7 +16,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "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) { func Fetch(iri *url.URL) (b []byte, err error) {

View File

@ -8,7 +8,7 @@ import (
"code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/auth"
user_model "code.gitea.io/gitea/models/user" 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 { func FederatedUserNew(name string, IRI ap.IRI) error {

View File

@ -19,7 +19,7 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers/api/v1/utils" "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 // Person function returns the Person actor for a user

View File

@ -17,7 +17,7 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers/api/v1/utils" "code.gitea.io/gitea/routers/api/v1/utils"
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
) )
// Repo function // Repo function

View File

@ -16,7 +16,7 @@ import (
gitea_context "code.gitea.io/gitea/modules/context" gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/go-fed/httpsig" "github.com/go-fed/httpsig"
) )

View File

@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
ap "gitea.com/Ta180m/activitypub" ap "github.com/go-ap/activitypub"
"github.com/go-ap/jsonld" "github.com/go-ap/jsonld"
) )