From 7eac113594d76c3b6a49e61fa7b5ed903792914f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 3 May 2022 20:15:21 +0200 Subject: [PATCH] caldav, carddav: simplify with internal.IsNotFound --- caldav/server.go | 2 +- carddav/client.go | 9 ++++----- carddav/server.go | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/caldav/server.go b/caldav/server.go index b34e72a..1719b86 100644 --- a/caldav/server.go +++ b/caldav/server.go @@ -198,7 +198,7 @@ func (b *backend) Options(r *http.Request) (caps []string, allow []string, err e var dataReq CalendarCompRequest _, err = b.Backend.GetCalendarObject(r.Context(), r.URL.Path, &dataReq) - if httpErr, ok := err.(*internal.HTTPError); ok && httpErr.Code == http.StatusNotFound { + if internal.IsNotFound(err) { return caps, []string{http.MethodOptions, http.MethodPut}, nil } else if err != nil { return nil, nil, err diff --git a/carddav/client.go b/carddav/client.go index a98dc80..3b4c994 100644 --- a/carddav/client.go +++ b/carddav/client.go @@ -450,11 +450,10 @@ func (c *Client) SyncCollection(path string, query *SyncQuery) (*SyncResponse, e ret := &SyncResponse{SyncToken: ms.SyncToken} for _, resp := range ms.Responses { p, err := resp.Path() - if err != nil { - if err, ok := err.(*internal.HTTPError); ok && err.Code == http.StatusNotFound { - ret.Deleted = append(ret.Deleted, p) - continue - } + if internal.IsNotFound(err) { + ret.Deleted = append(ret.Deleted, p) + continue + } else if err != nil { return nil, err } diff --git a/carddav/server.go b/carddav/server.go index 68ef609..e816efb 100644 --- a/carddav/server.go +++ b/carddav/server.go @@ -252,7 +252,7 @@ func (b *backend) Options(r *http.Request) (caps []string, allow []string, err e var dataReq AddressDataRequest _, err = b.Backend.GetAddressObject(r.Context(), r.URL.Path, &dataReq) - if httpErr, ok := err.(*internal.HTTPError); ok && httpErr.Code == http.StatusNotFound { + if internal.IsNotFound(err) { return caps, []string{http.MethodOptions, http.MethodPut}, nil } else if err != nil { return nil, nil, err