mirrors/apollo-backend
2
0
Fork 0
mirror of https://github.com/christianselig/apollo-backend synced 2024-11-25 21:27:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

simplify reddit error handling

Browse source
This commit is contained in:
Andre Medeiros 2022-05-23 11:33:15 -04:00
parent 6f8f93f3ab
commit c35ec006f1
1 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
internal/reddit/client.go
View file

@ -165,17 +165,16 @@ func (rc *Client) doRequest(ctx context.Context, r *Request) ([]byte, *RateLimit
rli.Timestamp = time.Now().String() rli.Timestamp = time.Now().String()
} }
if resp.StatusCode != 200 { switch resp.StatusCode {
case 200:
bb, err := ioutil.ReadAll(resp.Body)
return bb, rli, err
case 401, 403:
return nil, rli, ErrOauthRevoked
default:
_ = rc.statsd.Incr("reddit.api.errors", r.tags, 0.1) _ = rc.statsd.Incr("reddit.api.errors", r.tags, 0.1)
return nil, rli, ServerError{resp.StatusCode} return nil, rli, ServerError{resp.StatusCode}
} }
bb, err := ioutil.ReadAll(resp.Body)
if err != nil {
_ = rc.statsd.Incr("reddit.api.errors", r.tags, 0.1)
return nil, rli, err
}
return bb, rli, nil
} }
func (rac *AuthenticatedClient) request(ctx context.Context, r *Request, rh ResponseHandler, empty interface{}) (interface{}, error) { func (rac *AuthenticatedClient) request(ctx context.Context, r *Request, rh ResponseHandler, empty interface{}) (interface{}, error) {
@ -434,13 +433,6 @@ func (rac *AuthenticatedClient) MessageInbox(ctx context.Context, opts ...Reques
lr, err := rac.request(ctx, req, NewListingResponse, EmptyListingResponse) lr, err := rac.request(ctx, req, NewListingResponse, EmptyListingResponse)
if err != nil { if err != nil {
switch rerr := err.(type) {
case ServerError:
if rerr.StatusCode == 403 {
return nil, ErrOauthRevoked
}
}
return nil, err return nil, err
} }
return lr.(*ListingResponse), nil return lr.(*ListingResponse), nil
@ -460,13 +452,6 @@ func (rac *AuthenticatedClient) MessageUnread(ctx context.Context, opts ...Reque
lr, err := rac.request(ctx, req, NewListingResponse, EmptyListingResponse) lr, err := rac.request(ctx, req, NewListingResponse, EmptyListingResponse)
if err != nil { if err != nil {
switch rerr := err.(type) {
case ServerError:
if rerr.StatusCode == 403 {
return nil, ErrOauthRevoked
}
}
return nil, err return nil, err
} }
return lr.(*ListingResponse), nil return lr.(*ListingResponse), nil
@ -484,13 +469,6 @@ func (rac *AuthenticatedClient) Me(ctx context.Context, opts ...RequestOption) (
req := NewRequest(opts...) req := NewRequest(opts...)
mr, err := rac.request(ctx, req, NewMeResponse, nil) mr, err := rac.request(ctx, req, NewMeResponse, nil)
if err != nil { if err != nil {
switch rerr := err.(type) {
case ServerError:
if rerr.StatusCode == 403 {
return nil, ErrOauthRevoked
}
}
return nil, err return nil, err
} }
return mr.(*MeResponse), nil return mr.(*MeResponse), nil