mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-29 22:16:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Tobi's style for wrapping errors

Browse source
This commit is contained in:
Vyr Cossont 2025-01-20 22:26:03 -08:00
commit 4f39da77bb
5 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/processing/push/create.go
View file

@ -41,9 +41,8 @@ func (p *Processor) CreateOrReplace(
// Clear any previous subscription.
if err := p.state.DB.DeleteWebPushSubscriptionByTokenID(ctx, tokenID); err != nil {
return nil, gtserror.NewErrorInternalError(
gtserror.Newf("couldn't delete Web Push subscription for token ID %s: %w", tokenID, err),
)
err := gtserror.Newf("couldn't delete Web Push subscription for token ID %s: %w", tokenID, err)
return nil, gtserror.NewErrorInternalError(err)
}
// Insert a new one.
@ -58,9 +57,8 @@ func (p *Processor) CreateOrReplace(
}
if err := p.state.DB.PutWebPushSubscription(ctx, subscription); err != nil {
return nil, gtserror.NewErrorInternalError(
gtserror.Newf("couldn't create Web Push subscription for token ID %s: %w", tokenID, err),
)
err := gtserror.Newf("couldn't create Web Push subscription for token ID %s: %w", tokenID, err)
return nil, gtserror.NewErrorInternalError(err)
}
return p.apiSubscription(ctx, subscription)

5
internal/processing/push/delete.go
View file

@ -31,9 +31,8 @@ func (p *Processor) Delete(ctx context.Context, accessToken string) gtserror.Wit
}
if err := p.state.DB.DeleteWebPushSubscriptionByTokenID(ctx, tokenID); err != nil {
return gtserror.NewErrorInternalError(
gtserror.Newf("couldn't delete Web Push subscription for token ID %s: %w", tokenID, err),
)
err := gtserror.Newf("couldn't delete Web Push subscription for token ID %s: %w", tokenID, err)
return gtserror.NewErrorInternalError(err)
}
return nil

8
internal/processing/push/get.go
View file

@ -35,12 +35,12 @@ func (p *Processor) Get(ctx context.Context, accessToken string) (*apimodel.WebP
subscription, err := p.state.DB.GetWebPushSubscriptionByTokenID(ctx, tokenID)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return nil, gtserror.NewErrorInternalError(
gtserror.Newf("couldn't get Web Push subscription for token ID %s: %w", tokenID, err),
)
err := gtserror.Newf("couldn't get Web Push subscription for token ID %s: %w", tokenID, err)
return nil, gtserror.NewErrorInternalError(err)
}
if subscription == nil {
return nil, gtserror.NewErrorNotFound(errors.New("no Web Push subscription exists for this access token"))
err := errors.New("no Web Push subscription exists for this access token")
return nil, gtserror.NewErrorNotFound(err)
}
return p.apiSubscription(ctx, subscription)

10
internal/processing/push/push.go
View file

@ -44,9 +44,8 @@ func New(state *state.State, converter *typeutils.Converter) Processor {
func (p *Processor) getTokenID(ctx context.Context, accessToken string) (string, gtserror.WithCode) {
token, err := p.state.DB.GetTokenByAccess(ctx, accessToken)
if err != nil {
return "", gtserror.NewErrorInternalError(
gtserror.Newf("couldn't find token ID for access token: %w", err),
)
err := gtserror.Newf("couldn't find token ID for access token: %w", err)
return "", gtserror.NewErrorInternalError(err)
}
return token.ID, nil
@ -57,9 +56,8 @@ func (p *Processor) getTokenID(ctx context.Context, accessToken string) (string,
func (p *Processor) apiSubscription(ctx context.Context, subscription *gtsmodel.WebPushSubscription) (*apimodel.WebPushSubscription, gtserror.WithCode) {
apiSubscription, err := p.converter.WebPushSubscriptionToAPIWebPushSubscription(ctx, subscription)
if err != nil {
return nil, gtserror.NewErrorInternalError(
gtserror.Newf("error converting Web Push subscription %s to API representation: %w", subscription.ID, err),
)
err := gtserror.Newf("error converting Web Push subscription %s to API representation: %w", subscription.ID, err)
return nil, gtserror.NewErrorInternalError(err)
}
return apiSubscription, nil

13
internal/processing/push/update.go
View file

@ -40,12 +40,12 @@ func (p *Processor) Update(
// Get existing subscription.
subscription, err := p.state.DB.GetWebPushSubscriptionByTokenID(ctx, tokenID)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return nil, gtserror.NewErrorInternalError(
gtserror.Newf("couldn't get Web Push subscription for token ID %s: %w", tokenID, err),
)
err := gtserror.Newf("couldn't get Web Push subscription for token ID %s: %w", tokenID, err)
return nil, gtserror.NewErrorInternalError(err)
}
if subscription == nil {
return nil, gtserror.NewErrorNotFound(errors.New("no Web Push subscription exists for this access token"))
err := errors.New("no Web Push subscription exists for this access token")
return nil, gtserror.NewErrorNotFound(err)
}
// Update it.
@ -55,9 +55,8 @@ func (p *Processor) Update(
subscription,
"notification_flags",
); err != nil {
return nil, gtserror.NewErrorInternalError(
gtserror.Newf("couldn't update Web Push subscription for token ID %s: %w", tokenID, err),
)
err := gtserror.Newf("couldn't update Web Push subscription for token ID %s: %w", tokenID, err)
return nil, gtserror.NewErrorInternalError(err)
}
return p.apiSubscription(ctx, subscription)