diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go index a07f268dc..d91758767 100644 --- a/cmd/gotosocial/action/testrig/testrig.go +++ b/cmd/gotosocial/action/testrig/testrig.go @@ -50,7 +50,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/tracing" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/web" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -165,7 +164,7 @@ var Start action.GTSAction = func(ctx context.Context) error { federator := testrig.NewTestFederator(state, transportController, mediaManager) emailSender := testrig.NewEmailSender("./web/template/", nil) - webPushSender := webpush.NewMockSender() + webPushSender := testrig.NewWebPushMockSender() typeConverter := typeutils.NewConverter(state) filter := visibility.NewFilter(state) diff --git a/internal/api/activitypub/emoji/emojiget_test.go b/internal/api/activitypub/emoji/emojiget_test.go index fa2da781d..7d3587fd8 100644 --- a/internal/api/activitypub/emoji/emojiget_test.go +++ b/internal/api/activitypub/emoji/emojiget_test.go @@ -38,7 +38,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -93,7 +92,7 @@ func (suite *EmojiGetTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.emojiModule = emoji.New(suite.processor) diff --git a/internal/api/activitypub/users/user_test.go b/internal/api/activitypub/users/user_test.go index 6a54ed576..d66fe8cf9 100644 --- a/internal/api/activitypub/users/user_test.go +++ b/internal/api/activitypub/users/user_test.go @@ -33,7 +33,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -105,7 +104,7 @@ func (suite *UserStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) testrig.StartWorkers(&suite.state, suite.processor.Workers()) diff --git a/internal/api/auth/auth_test.go b/internal/api/auth/auth_test.go index 77fb728f5..cfbdec7ec 100644 --- a/internal/api/auth/auth_test.go +++ b/internal/api/auth/auth_test.go @@ -39,7 +39,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -96,7 +95,7 @@ func (suite *AuthStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.authModule = auth.New(suite.db, suite.processor, suite.idp) diff --git a/internal/api/client/accounts/account_test.go b/internal/api/client/accounts/account_test.go index 133341b4e..e700ade78 100644 --- a/internal/api/client/accounts/account_test.go +++ b/internal/api/client/accounts/account_test.go @@ -39,7 +39,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -105,7 +104,7 @@ func (suite *AccountStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.accountsModule = accounts.New(suite.processor) diff --git a/internal/api/client/admin/admin_test.go b/internal/api/client/admin/admin_test.go index 58a091b40..f44d48d78 100644 --- a/internal/api/client/admin/admin_test.go +++ b/internal/api/client/admin/admin_test.go @@ -39,7 +39,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -111,7 +110,7 @@ func (suite *AdminStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.adminModule = admin.New(&suite.state, suite.processor) diff --git a/internal/api/client/bookmarks/bookmarks_test.go b/internal/api/client/bookmarks/bookmarks_test.go index 05998caa2..a11597f7c 100644 --- a/internal/api/client/bookmarks/bookmarks_test.go +++ b/internal/api/client/bookmarks/bookmarks_test.go @@ -44,7 +44,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -119,7 +118,7 @@ func (suite *BookmarkTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.statusModule = statuses.New(suite.processor) diff --git a/internal/api/client/exports/exports_test.go b/internal/api/client/exports/exports_test.go index 7047d0849..55d873348 100644 --- a/internal/api/client/exports/exports_test.go +++ b/internal/api/client/exports/exports_test.go @@ -34,7 +34,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/oauth" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -96,7 +95,7 @@ func (suite *ExportsTestSuite) SetupTest() { &suite.state, federator, testrig.NewEmailSender("../../../../web/template/", nil), - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), mediaManager, ) diff --git a/internal/api/client/favourites/favourites_test.go b/internal/api/client/favourites/favourites_test.go index 225e45693..7cfa205e3 100644 --- a/internal/api/client/favourites/favourites_test.go +++ b/internal/api/client/favourites/favourites_test.go @@ -31,7 +31,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -103,7 +102,7 @@ func (suite *FavouritesStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.favModule = favourites.New(suite.processor) diff --git a/internal/api/client/filters/v1/filter_test.go b/internal/api/client/filters/v1/filter_test.go index 4cac66020..558f3d959 100644 --- a/internal/api/client/filters/v1/filter_test.go +++ b/internal/api/client/filters/v1/filter_test.go @@ -37,7 +37,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/stream" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -110,7 +109,7 @@ func (suite *FiltersTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.filtersModule = filtersV1.New(suite.processor) diff --git a/internal/api/client/filters/v2/filter_test.go b/internal/api/client/filters/v2/filter_test.go index 3c4bc0596..8301c67ad 100644 --- a/internal/api/client/filters/v2/filter_test.go +++ b/internal/api/client/filters/v2/filter_test.go @@ -37,7 +37,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/stream" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -109,7 +108,7 @@ func (suite *FiltersTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.filtersModule = filtersV2.New(suite.processor) diff --git a/internal/api/client/followedtags/followedtags_test.go b/internal/api/client/followedtags/followedtags_test.go index 864aae7b5..816e1d0cc 100644 --- a/internal/api/client/followedtags/followedtags_test.go +++ b/internal/api/client/followedtags/followedtags_test.go @@ -32,7 +32,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -93,7 +92,7 @@ func (suite *FollowedTagsTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.followedTagsModule = followedtags.New(suite.processor) diff --git a/internal/api/client/followrequests/followrequest_test.go b/internal/api/client/followrequests/followrequest_test.go index a3677f12e..787d47c84 100644 --- a/internal/api/client/followrequests/followrequest_test.go +++ b/internal/api/client/followrequests/followrequest_test.go @@ -38,7 +38,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -101,7 +100,7 @@ func (suite *FollowRequestStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.followRequestModule = followrequests.New(suite.processor) diff --git a/internal/api/client/import/import_test.go b/internal/api/client/import/import_test.go index dd10124c1..fba83e1a3 100644 --- a/internal/api/client/import/import_test.go +++ b/internal/api/client/import/import_test.go @@ -32,7 +32,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/oauth" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -93,7 +92,7 @@ func (suite *ImportTestSuite) SetupTest() { &suite.state, federator, testrig.NewEmailSender("../../../../web/template/", nil), - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), mediaManager, ) testrig.StartWorkers(&suite.state, processor.Workers()) diff --git a/internal/api/client/instance/instance_test.go b/internal/api/client/instance/instance_test.go index 90bb7d5d8..f0427369b 100644 --- a/internal/api/client/instance/instance_test.go +++ b/internal/api/client/instance/instance_test.go @@ -38,7 +38,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -104,7 +103,7 @@ func (suite *InstanceStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.instanceModule = instance.New(suite.processor) diff --git a/internal/api/client/lists/lists_test.go b/internal/api/client/lists/lists_test.go index e0332302c..5fd2304c7 100644 --- a/internal/api/client/lists/lists_test.go +++ b/internal/api/client/lists/lists_test.go @@ -31,7 +31,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -104,7 +103,7 @@ func (suite *ListsStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.listsModule = lists.New(suite.processor) diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go index e9eceb34b..d26f2bb7a 100644 --- a/internal/api/client/media/mediacreate_test.go +++ b/internal/api/client/media/mediacreate_test.go @@ -44,7 +44,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -109,7 +108,7 @@ func (suite *MediaCreateTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) diff --git a/internal/api/client/media/mediaupdate_test.go b/internal/api/client/media/mediaupdate_test.go index 683bbfe85..dd115f465 100644 --- a/internal/api/client/media/mediaupdate_test.go +++ b/internal/api/client/media/mediaupdate_test.go @@ -42,7 +42,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -107,7 +106,7 @@ func (suite *MediaUpdateTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) diff --git a/internal/api/client/mutes/mutes_test.go b/internal/api/client/mutes/mutes_test.go index b1958310e..3f5686cfb 100644 --- a/internal/api/client/mutes/mutes_test.go +++ b/internal/api/client/mutes/mutes_test.go @@ -39,7 +39,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -101,7 +100,7 @@ func (suite *MutesTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.mutesModule = mutes.New(suite.processor) diff --git a/internal/api/client/notifications/notifications_test.go b/internal/api/client/notifications/notifications_test.go index 8fce6b939..5794c0e12 100644 --- a/internal/api/client/notifications/notifications_test.go +++ b/internal/api/client/notifications/notifications_test.go @@ -31,7 +31,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -105,7 +104,7 @@ func (suite *NotificationsTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.notificationsModule = notifications.New(suite.processor) diff --git a/internal/api/client/polls/polls_test.go b/internal/api/client/polls/polls_test.go index 8b06e6660..8c2bc8ba1 100644 --- a/internal/api/client/polls/polls_test.go +++ b/internal/api/client/polls/polls_test.go @@ -31,7 +31,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -44,7 +43,7 @@ type PollsStandardTestSuite struct { processor *processing.Processor emailSender email.Sender sentEmails map[string]string - webPushSender *webpush.MockSender + webPushSender *testrig.WebPushMockSender state state.State // standard suite models @@ -97,7 +96,7 @@ func (suite *PollsStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.pollsModule = polls.New(suite.processor) diff --git a/internal/api/client/push/push_test.go b/internal/api/client/push/push_test.go index 356339286..0d85192ff 100644 --- a/internal/api/client/push/push_test.go +++ b/internal/api/client/push/push_test.go @@ -31,7 +31,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -91,7 +90,7 @@ func (suite *PushTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.pushModule = push.New(suite.processor) diff --git a/internal/api/client/reports/reports_test.go b/internal/api/client/reports/reports_test.go index 058593299..89240a4b1 100644 --- a/internal/api/client/reports/reports_test.go +++ b/internal/api/client/reports/reports_test.go @@ -31,7 +31,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -96,7 +95,7 @@ func (suite *ReportsStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.reportsModule = reports.New(suite.processor) diff --git a/internal/api/client/search/search_test.go b/internal/api/client/search/search_test.go index 7dba187e3..219966c7c 100644 --- a/internal/api/client/search/search_test.go +++ b/internal/api/client/search/search_test.go @@ -38,7 +38,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -100,7 +99,7 @@ func (suite *SearchStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.searchModule = search.New(suite.processor) diff --git a/internal/api/client/statuses/status_test.go b/internal/api/client/statuses/status_test.go index bd3b4d1b4..c5f2838e8 100644 --- a/internal/api/client/statuses/status_test.go +++ b/internal/api/client/statuses/status_test.go @@ -38,7 +38,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -216,7 +215,7 @@ func (suite *StatusStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.statusModule = statuses.New(suite.processor) diff --git a/internal/api/client/streaming/streaming_test.go b/internal/api/client/streaming/streaming_test.go index 3d3ff11bd..00ad2de03 100644 --- a/internal/api/client/streaming/streaming_test.go +++ b/internal/api/client/streaming/streaming_test.go @@ -44,7 +44,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -116,7 +115,7 @@ func (suite *StreamingTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.streamingModule = streaming.New(suite.processor, 1, 4096) diff --git a/internal/api/client/tags/tags_test.go b/internal/api/client/tags/tags_test.go index dc44f8356..c24574d47 100644 --- a/internal/api/client/tags/tags_test.go +++ b/internal/api/client/tags/tags_test.go @@ -40,7 +40,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -101,7 +100,7 @@ func (suite *TagsTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.tagsModule = tags.New(suite.processor) diff --git a/internal/api/client/user/emailchange_test.go b/internal/api/client/user/emailchange_test.go index fc774dce6..868ad766c 100644 --- a/internal/api/client/user/emailchange_test.go +++ b/internal/api/client/user/emailchange_test.go @@ -27,7 +27,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/api/client/user" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -45,7 +44,7 @@ func (suite *EmailChangeTestSuite) TestEmailChangePOST() { storage := testrig.NewInMemoryStorage() sentEmails := make(map[string]string) emailSender := testrig.NewEmailSender("../../../../web/template/", sentEmails) - webPushSender := webpush.NewNoopSender() + webPushSender := testrig.NewNoopWebPushSender() processor := testrig.NewTestProcessor(state, suite.federator, emailSender, webPushSender, suite.mediaManager) testrig.StartWorkers(state, processor.Workers()) userModule := user.New(processor) diff --git a/internal/api/client/user/user_test.go b/internal/api/client/user/user_test.go index 45c4f5296..8cf359cd8 100644 --- a/internal/api/client/user/user_test.go +++ b/internal/api/client/user/user_test.go @@ -36,7 +36,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -99,7 +98,7 @@ func (suite *UserStandardTestSuite) SetupTest() { &suite.state, suite.federator, testrig.NewEmailSender("../../../../web/template/", nil), - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.userModule = user.New(suite.processor) diff --git a/internal/api/fileserver/fileserver_test.go b/internal/api/fileserver/fileserver_test.go index 72907ce72..9b0580e92 100644 --- a/internal/api/fileserver/fileserver_test.go +++ b/internal/api/fileserver/fileserver_test.go @@ -33,7 +33,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -88,7 +87,7 @@ func (suite *FileserverTestSuite) SetupSuite() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) diff --git a/internal/api/wellknown/webfinger/webfinger_test.go b/internal/api/wellknown/webfinger/webfinger_test.go index 5613edbbc..234c1ad16 100644 --- a/internal/api/wellknown/webfinger/webfinger_test.go +++ b/internal/api/wellknown/webfinger/webfinger_test.go @@ -32,7 +32,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -99,7 +98,7 @@ func (suite *WebfingerStandardTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) suite.webfingerModule = webfinger.New(suite.processor) diff --git a/internal/api/wellknown/webfinger/webfingerget_test.go b/internal/api/wellknown/webfinger/webfingerget_test.go index 42d6915f2..4bb6f323d 100644 --- a/internal/api/wellknown/webfinger/webfingerget_test.go +++ b/internal/api/wellknown/webfinger/webfingerget_test.go @@ -40,7 +40,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -99,7 +98,7 @@ func (suite *WebfingerGetTestSuite) funkifyAccountDomain(host string, accountDom testrig.NewTestMediaManager(&suite.state), &suite.state, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), visibility.NewFilter(&suite.state), interaction.NewFilter(&suite.state), ) diff --git a/internal/processing/admin/admin_test.go b/internal/processing/admin/admin_test.go index 368202f43..ad9d9b2ae 100644 --- a/internal/processing/admin/admin_test.go +++ b/internal/processing/admin/admin_test.go @@ -37,7 +37,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/subscriptions" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -120,7 +119,7 @@ func (suite *AdminStandardTestSuite) SetupTest() { suite.mediaManager, &suite.state, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), visibility.NewFilter(&suite.state), interaction.NewFilter(&suite.state), ) diff --git a/internal/processing/processor_test.go b/internal/processing/processor_test.go index d571723ea..84ab9ef48 100644 --- a/internal/processing/processor_test.go +++ b/internal/processing/processor_test.go @@ -38,7 +38,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/subscriptions" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -136,7 +135,7 @@ func (suite *ProcessingStandardTestSuite) SetupTest() { suite.mediaManager, &suite.state, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), visibility.NewFilter(&suite.state), interaction.NewFilter(&suite.state), ) diff --git a/internal/processing/workers/fromclientapi_test.go b/internal/processing/workers/fromclientapi_test.go index ad7d6e985..acb25673d 100644 --- a/internal/processing/workers/fromclientapi_test.go +++ b/internal/processing/workers/fromclientapi_test.go @@ -36,7 +36,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/stream" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -182,7 +181,7 @@ func (suite *FromClientAPITestSuite) checkStreamed( // checkWebPushed asserts that the target account got a single Web Push notification with a given type. func (suite *FromClientAPITestSuite) checkWebPushed( - sender *webpush.MockSender, + sender *testrig.WebPushMockSender, accountID string, notificationType gtsmodel.NotificationType, ) { @@ -195,7 +194,7 @@ func (suite *FromClientAPITestSuite) checkWebPushed( // checkNotWebPushed asserts that the target account got no Web Push notifications. func (suite *FromClientAPITestSuite) checkNotWebPushed( - sender *webpush.MockSender, + sender *testrig.WebPushMockSender, accountID string, ) { pushedNotifications := sender.Sent[accountID] diff --git a/internal/transport/transport_test.go b/internal/transport/transport_test.go index b02852468..61df16e52 100644 --- a/internal/transport/transport_test.go +++ b/internal/transport/transport_test.go @@ -33,7 +33,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -94,7 +93,7 @@ func (suite *TransportTestSuite) SetupTest() { &suite.state, suite.federator, suite.emailSender, - webpush.NewNoopSender(), + testrig.NewNoopWebPushSender(), suite.mediaManager, ) diff --git a/internal/typeutils/converter_test.go b/internal/typeutils/converter_test.go index 6aef583f2..3ed2828f2 100644 --- a/internal/typeutils/converter_test.go +++ b/internal/typeutils/converter_test.go @@ -27,7 +27,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -541,7 +540,7 @@ func (suite *TypeUtilsTestSuite) GetProcessor() *processing.Processor { mediaManager := testrig.NewTestMediaManager(&suite.state) federator := testrig.NewTestFederator(&suite.state, transportController, mediaManager) emailSender := testrig.NewEmailSender("../../web/template/", nil) - webPushSender := webpush.NewNoopSender() + webPushSender := testrig.NewNoopWebPushSender() processor := testrig.NewTestProcessor(&suite.state, federator, emailSender, webPushSender, mediaManager) testrig.StartWorkers(&suite.state, processor.Workers()) diff --git a/internal/webpush/noopsender.go b/internal/webpush/noopsender.go deleted file mode 100644 index 2676a9e89..000000000 --- a/internal/webpush/noopsender.go +++ /dev/null @@ -1,42 +0,0 @@ -// GoToSocial -// Copyright (C) GoToSocial Authors admin@gotosocial.org -// SPDX-License-Identifier: AGPL-3.0-or-later -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -package webpush - -import ( - "context" - - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" -) - -// noopSender drops anything sent to it. -// This should only be used in tests. -type noopSender struct{} - -func NewNoopSender() Sender { - return &noopSender{} -} - -func (n *noopSender) Send( - ctx context.Context, - notification *gtsmodel.Notification, - filters []*gtsmodel.Filter, - mutes *usermute.CompiledUserMuteList, -) error { - return nil -} diff --git a/testrig/teststructs.go b/testrig/teststructs.go index e0c582a2d..7d5c3caab 100644 --- a/testrig/teststructs.go +++ b/testrig/teststructs.go @@ -29,7 +29,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/subscriptions" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" ) // TestStructs encapsulates structs needed to @@ -48,7 +47,7 @@ type TestStructs struct { HTTPClient *MockHTTPClient TypeConverter *typeutils.Converter EmailSender email.Sender - WebPushSender *webpush.MockSender + WebPushSender *WebPushMockSender TransportController transport.Controller } @@ -85,7 +84,7 @@ func SetupTestStructs( federator := NewTestFederator(&state, transportController, mediaManager) oauthServer := NewTestOauthServer(db) emailSender := NewEmailSender(rTemplatePath, nil) - webPushSender := webpush.NewMockSender() + webPushSender := NewWebPushMockSender() common := common.New( &state, diff --git a/internal/webpush/mocksender.go b/testrig/webpush.go similarity index 61% rename from internal/webpush/mocksender.go rename to testrig/webpush.go index c8aac301e..4cd5d7a81 100644 --- a/internal/webpush/mocksender.go +++ b/testrig/webpush.go @@ -15,28 +15,29 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -package webpush +package testrig import ( "context" "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/webpush" ) -// MockSender collects a map of notifications sent to each account ID. -// This should only be used in tests. -type MockSender struct { +// WebPushMockSender collects a map of notifications sent to each account ID. +type WebPushMockSender struct { Sent map[string][]*gtsmodel.Notification } -func NewMockSender() *MockSender { - return &MockSender{ +// NewWebPushMockSender creates a mock sender that can record sent Web Push notifications for test expectations. +func NewWebPushMockSender() *WebPushMockSender { + return &WebPushMockSender{ Sent: map[string][]*gtsmodel.Notification{}, } } -func (m *MockSender) Send( +func (m *WebPushMockSender) Send( ctx context.Context, notification *gtsmodel.Notification, filters []*gtsmodel.Filter, @@ -45,3 +46,20 @@ func (m *MockSender) Send( m.Sent[notification.TargetAccountID] = append(m.Sent[notification.TargetAccountID], notification) return nil } + +// noopSender drops anything sent to it. +type noopWebPushSender struct{} + +// NewNoopWebPushSender creates a no-op sender that does nothing. +func NewNoopWebPushSender() webpush.Sender { + return &noopWebPushSender{} +} + +func (n *noopWebPushSender) Send( + ctx context.Context, + notification *gtsmodel.Notification, + filters []*gtsmodel.Filter, + mutes *usermute.CompiledUserMuteList, +) error { + return nil +}