diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2025-01-23 17:18:23 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2025-01-23 18:18:23 +0100 |
| commit | 9333bbc4d0d5ae46c72fca1f5b1aacb3c0a7653e (patch) | |
| tree | e7ccd1dc3abff5386e0b86e6baf659c9aa3b55a5 /testrig | |
| parent | [feature] Add warning about `trusted-proxies` to make config easier (#3675) (diff) | |
| download | gotosocial-9333bbc4d0d5ae46c72fca1f5b1aacb3c0a7653e.tar.xz | |
[feature] Serve bot accounts over AP as Service instead of Person (#3672)
* pepis
* oopsie doopsie
* bollocks
Diffstat (limited to 'testrig')
| -rw-r--r-- | testrig/testmodels.go | 14 | ||||
| -rw-r--r-- | testrig/transportcontroller.go | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/testrig/testmodels.go b/testrig/testmodels.go index 81c3a85c5..da4202eed 100644 --- a/testrig/testmodels.go +++ b/testrig/testmodels.go @@ -2853,7 +2853,7 @@ func NewTestActivities(accounts map[string]*gtsmodel.Account) map[string]Activit "this is a public status, please forward it!", "", URLMustParse("http://example.org/users/Some_User"), - []*url.URL{URLMustParse(pub.PublicActivityPubIRI)}, + []*url.URL{ap.PublicURI()}, nil, false, []vocab.ActivityStreamsMention{}, @@ -3207,7 +3207,7 @@ func NewTestFediStatuses() map[string]vocab.ActivityStreamsNote { "this is a public status, please forward it!", "", URLMustParse("http://example.org/users/Some_User"), - []*url.URL{URLMustParse(pub.PublicActivityPubIRI)}, + []*url.URL{ap.PublicURI()}, nil, false, []vocab.ActivityStreamsMention{}, @@ -3228,7 +3228,7 @@ func NewTestFediStatuses() map[string]vocab.ActivityStreamsNote { "", URLMustParse("https://unknown-instance.com/users/brand_new_person"), []*url.URL{ - URLMustParse(pub.PublicActivityPubIRI), + ap.PublicURI(), }, []*url.URL{}, false, @@ -3244,7 +3244,7 @@ func NewTestFediStatuses() map[string]vocab.ActivityStreamsNote { "", URLMustParse("https://unknown-instance.com/users/brand_new_person"), []*url.URL{ - URLMustParse(pub.PublicActivityPubIRI), + ap.PublicURI(), }, []*url.URL{}, false, @@ -3265,7 +3265,7 @@ func NewTestFediStatuses() map[string]vocab.ActivityStreamsNote { "", URLMustParse("https://unknown-instance.com/users/brand_new_person"), []*url.URL{ - URLMustParse(pub.PublicActivityPubIRI), + ap.PublicURI(), }, []*url.URL{}, false, @@ -3286,7 +3286,7 @@ func NewTestFediStatuses() map[string]vocab.ActivityStreamsNote { "", URLMustParse("https://turnip.farm/users/turniplover6969"), []*url.URL{ - URLMustParse(pub.PublicActivityPubIRI), + ap.PublicURI(), }, []*url.URL{}, false, @@ -3309,7 +3309,7 @@ func NewTestFediStatuses() map[string]vocab.ActivityStreamsNote { "", URLMustParse("http://fossbros-anonymous.io/users/foss_satan"), []*url.URL{ - URLMustParse(pub.PublicActivityPubIRI), + ap.PublicURI(), }, []*url.URL{}, false, diff --git a/testrig/transportcontroller.go b/testrig/transportcontroller.go index 3bc8752e0..b886e5c40 100644 --- a/testrig/transportcontroller.go +++ b/testrig/transportcontroller.go @@ -29,6 +29,7 @@ import ( "github.com/superseriousbusiness/activity/pub" "github.com/superseriousbusiness/activity/streams" "github.com/superseriousbusiness/activity/streams/vocab" + "github.com/superseriousbusiness/gotosocial/internal/ap" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/federation" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -81,7 +82,7 @@ type MockHTTPClient struct { // to customize how the client is mocked. // // Note that you should never ever make ACTUAL http calls with this thing. -func NewMockHTTPClient(do func(req *http.Request) (*http.Response, error), relativeMediaPath string, extraPeople ...vocab.ActivityStreamsPerson) *MockHTTPClient { +func NewMockHTTPClient(do func(req *http.Request) (*http.Response, error), relativeMediaPath string, extraPeople ...ap.Accountable) *MockHTTPClient { mockHTTPClient := &MockHTTPClient{} if do != nil { |