diff options
| author |  Daenney <git@noreply.sourcery.dny.nu> | 2025-05-22 12:26:11 +0200 |
|---|---|---|
| committer |  kim <gruf@noreply.codeberg.org> | 2025-05-22 12:26:11 +0200 |
| commit | d5c9c4adc167cdb05e73f5105702cf340293e61c (patch) | |
| tree | 1d21fe376099864900837eba675a965517f98e5d /internal/webpush | |
| parent | [feature] Allow exposing allows, implement `/api/v1/domain_blocks` and `/api/... (diff) | |
| download | gotosocial-d5c9c4adc167cdb05e73f5105702cf340293e61c.tar.xz | |
[chore] Upgrade to Go 1.24 (#4187)
* Set `go.mod` to 1.24 now that it's been out for 3 months.
* Update all the test to use `testing.T.Context()`.
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4187
Co-authored-by: Daenney <git@noreply.sourcery.dny.nu>
Co-committed-by: Daenney <git@noreply.sourcery.dny.nu>
Diffstat (limited to 'internal/webpush')
| -rw-r--r-- | internal/webpush/realsender.go | 3 | ||||
| -rw-r--r-- | internal/webpush/realsender_test.go | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/internal/webpush/realsender.go b/internal/webpush/realsender.go index 0a04a2b68..075927095 100644 --- a/internal/webpush/realsender.go +++ b/internal/webpush/realsender.go @@ -320,9 +320,8 @@ func formatNotificationTitle( case gtsmodel.NotificationPoll: if subscription.AccountID == notification.TargetAccountID { return "Your poll has ended" - } else { - return fmt.Sprintf("%s's poll has ended", displayNameOrAcct) } + return fmt.Sprintf("%s's poll has ended", displayNameOrAcct) case gtsmodel.NotificationStatus: return fmt.Sprintf("%s posted", displayNameOrAcct) case gtsmodel.NotificationAdminSignup: diff --git a/internal/webpush/realsender_test.go b/internal/webpush/realsender_test.go index cf9cf4cac..bddcbbc28 100644 --- a/internal/webpush/realsender_test.go +++ b/internal/webpush/realsender_test.go @@ -167,7 +167,7 @@ func (suite *RealSenderStandardTestSuite) simulatePushNotification( expectDeletedSubscription bool, ) error { // Don't let the test run forever if the push notification was not sent for some reason. - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + ctx, cancel := context.WithTimeout(suite.T().Context(), 3*time.Second) defer cancel() notification, err := suite.state.DB.GetNotificationByID(ctx, notificationID) @@ -263,7 +263,7 @@ func (suite *RealSenderStandardTestSuite) TestSendPolicyMismatch() { StatusOrEditID: "01F8MHAMCHF6Y650WCRSCP4WMY", Read: util.Ptr(false), } - if err := suite.db.PutNotification(context.Background(), notification); !suite.NoError(err) { + if err := suite.db.PutNotification(suite.T().Context(), notification); !suite.NoError(err) { suite.FailNow(err.Error()) return } |