From 920ec76fd2f4a907d59769cd893546cb89be356e Mon Sep 17 00:00:00 2001 From: Vyr Cossont Date: Sun, 19 Jan 2025 13:49:25 -0800 Subject: [PATCH] Post-rebase fixes --- cmd/gotosocial/action/server/server.go | 31 ++++++++++++-------------- internal/config/config.go | 4 ++-- internal/config/defaults.go | 4 ++-- internal/webpush/realsender_test.go | 6 +++++ testrig/teststructs.go | 4 ++-- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index e70673496..3aef73154 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -30,46 +30,43 @@ import ( "time" "github.com/KimMachineGun/automemlimit/memlimit" - webpushgo "github.com/SherClockHolmes/webpush-go" "github.com/gin-gonic/gin" "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action" "github.com/superseriousbusiness/gotosocial/internal/admin" "github.com/superseriousbusiness/gotosocial/internal/api" apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/spam" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media/ffmpeg" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/metrics" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/timeline" - "github.com/superseriousbusiness/gotosocial/internal/tracing" - "github.com/superseriousbusiness/gotosocial/internal/webpush" - "go.uber.org/automaxprocs/maxprocs" - "github.com/superseriousbusiness/gotosocial/internal/webpush" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db/bundb" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" "github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" + "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" + "github.com/superseriousbusiness/gotosocial/internal/filter/spam" + "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/httpclient" "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/media" + "github.com/superseriousbusiness/gotosocial/internal/media/ffmpeg" + "github.com/superseriousbusiness/gotosocial/internal/messages" + "github.com/superseriousbusiness/gotosocial/internal/metrics" + "github.com/superseriousbusiness/gotosocial/internal/middleware" "github.com/superseriousbusiness/gotosocial/internal/oauth" "github.com/superseriousbusiness/gotosocial/internal/oidc" "github.com/superseriousbusiness/gotosocial/internal/processing" + tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" "github.com/superseriousbusiness/gotosocial/internal/router" "github.com/superseriousbusiness/gotosocial/internal/state" gtsstorage "github.com/superseriousbusiness/gotosocial/internal/storage" + "github.com/superseriousbusiness/gotosocial/internal/subscriptions" + "github.com/superseriousbusiness/gotosocial/internal/timeline" + "github.com/superseriousbusiness/gotosocial/internal/tracing" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/web" + "github.com/superseriousbusiness/gotosocial/internal/webpush" + "go.uber.org/automaxprocs/maxprocs" ) // Start creates and starts a gotosocial server diff --git a/internal/config/config.go b/internal/config/config.go index bcd285e1f..f77c86c50 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -252,8 +252,8 @@ type CacheConfiguration struct { UserMuteMemRatio float64 `name:"user-mute-mem-ratio"` UserMuteIDsMemRatio float64 `name:"user-mute-ids-mem-ratio"` WebfingerMemRatio float64 `name:"webfinger-mem-ratio"` - WebPushSubscriptionMemRatio float64 `name:"web-push-subscription-mem-ratio"` - WebPushSubscriptionIDsMemRatio float64 `name:"web-push-subscription-ids-mem-ratio"` + WebPushSubscriptionMemRatio float64 `name:"web-push-subscription-mem-ratio"` + WebPushSubscriptionIDsMemRatio float64 `name:"web-push-subscription-ids-mem-ratio"` VisibilityMemRatio float64 `name:"visibility-mem-ratio"` } diff --git a/internal/config/defaults.go b/internal/config/defaults.go index 76b634189..157dfde0a 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -213,8 +213,8 @@ var Defaults = Configuration{ UserMuteMemRatio: 2, UserMuteIDsMemRatio: 3, WebfingerMemRatio: 0.1, - WebPushSubscriptionMemRatio: 1, - WebPushSubscriptionIDsMemRatio: 1, + WebPushSubscriptionMemRatio: 1, + WebPushSubscriptionIDsMemRatio: 1, VisibilityMemRatio: 2, }, diff --git a/internal/webpush/realsender_test.go b/internal/webpush/realsender_test.go index 49785ea5c..093314b7c 100644 --- a/internal/webpush/realsender_test.go +++ b/internal/webpush/realsender_test.go @@ -37,6 +37,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" + "github.com/superseriousbusiness/gotosocial/internal/subscriptions" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/webpush" @@ -128,6 +129,11 @@ func (suite *RealSenderStandardTestSuite) SetupTest() { suite.processor = processing.NewProcessor( cleaner.New(&suite.state), + subscriptions.New( + &suite.state, + suite.transportController, + suite.typeconverter, + ), suite.typeconverter, suite.federator, suite.oauthServer, diff --git a/testrig/teststructs.go b/testrig/teststructs.go index d68122d07..e0c582a2d 100644 --- a/testrig/teststructs.go +++ b/testrig/teststructs.go @@ -48,7 +48,7 @@ type TestStructs struct { HTTPClient *MockHTTPClient TypeConverter *typeutils.Converter EmailSender email.Sender - WebPushSender *webpush.MockSender + WebPushSender *webpush.MockSender TransportController transport.Controller } @@ -121,7 +121,7 @@ func SetupTestStructs( HTTPClient: httpClient, TypeConverter: typeconverter, EmailSender: emailSender, - WebPushSender: webPushSender, + WebPushSender: webPushSender, TransportController: transportController, } }