Skip to content

Commit 6fc5d31

Browse files
committed
fix: error cleanup
1 parent ce8a0db commit 6fc5d31

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

changes.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
var (
1212
ErrParsingChanges = fmt.Errorf("parsing changes payload: %w", ErrWebhooks)
13-
ErrChangesFieldNotSupported = fmt.Errorf("changes field not supported: %w", ErrWebhooks)
1413
ErrChangesTypeNotImplemented = fmt.Errorf("changes type not implemented: %w", ErrWebhooks)
1514
ErrInstagramMentionHandlerNotDefined = fmt.Errorf("instagram mentions handler not defined: %w", ErrWebhooks)
1615
ErrInstagramStoryInsightsHandlerNotDefined = fmt.Errorf("instagram story insights handler not defined: %w", ErrWebhooks)
@@ -90,7 +89,7 @@ func (hooks Webhooks) changes(ctx context.Context, object Object, entry Entry) e
9089

9190
func (h Webhooks) Changes(ctx context.Context, object Object, entry Entry, change Change) error {
9291
if object != Instagram {
93-
return fmt.Errorf("'%s': %w", object, ErrChangesFieldNotSupported)
92+
return fmt.Errorf("'%s': %w", object, ErrObjectNotSupported)
9493
}
9594

9695
select {

handler/entry_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestHandleEvent(t *testing.T) {
130130
handler.Options.CompileSchema(),
131131
}
132132
},
133-
expectErr: gometawebhooks.ErrChangesFieldNotSupported,
133+
expectErr: gometawebhooks.ErrObjectNotSupported,
134134
},
135135
{
136136
name: "no entries noop",

messaging.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
)
1010

1111
var (
12-
ErrMessagingFieldNotSupported = fmt.Errorf("messaging field not supported: %w", ErrWebhooks)
1312
ErrMessagingTypeNotImplemented = fmt.Errorf("messaging type not implemented: %w", ErrWebhooks)
1413
ErrInstagramMessageHandlerNotDefined = fmt.Errorf("instagram message handler not defined: %w", ErrWebhooks)
1514
ErrInstagramPostbackHandlerNotDefined = fmt.Errorf("instagram postback handler not defined: %w", ErrWebhooks)
@@ -99,7 +98,7 @@ func (hooks Webhooks) messaging(ctx context.Context, object Object, entry Entry)
9998

10099
func (h Webhooks) Messaging(ctx context.Context, object Object, entryId string, entryTime time.Time, messaging Messaging) error {
101100
if object != Instagram {
102-
return fmt.Errorf("'%s': %w", object, ErrMessagingFieldNotSupported)
101+
return fmt.Errorf("'%s': %w", object, ErrObjectNotSupported)
103102
}
104103

105104
select {

payload.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ var (
1616
ErrMissingHubSignatureHeader = fmt.Errorf("missing signature value: %w", ErrWebhooks)
1717
ErrHMACVerificationFailed = fmt.Errorf("HMAC verification failed: %w", ErrWebhooks)
1818
ErrParsingPayload = fmt.Errorf("error parsing payload: %w", ErrWebhooks)
19-
ErrParsingEvent = fmt.Errorf("error parsing event: %w", ErrWebhooks)
2019
)
2120

2221
func (hooks Webhooks) ParsePayload(body []byte) (Event, error) {
2322
var event Event
2423
if err := json.Unmarshal(body, &event); err != nil {
25-
return event, wrapErr(err, ErrParsingEvent)
24+
return event, wrapErr(err, ErrParsingPayload)
2625
}
2726
return event, nil
2827
}

0 commit comments

Comments
 (0)