improve error messages and fix wrong error being returned.

This commit is contained in:
fiatjaf
2023-11-06 11:17:45 -03:00
parent 604be14407
commit 274a6da19b
3 changed files with 4 additions and 4 deletions

View File

@@ -121,7 +121,7 @@ func grabData(ctx context.Context, code string, isProfileSitemap bool) (*Data, e
event, relays, err := getEvent(ctx, code, nil)
if err != nil {
log.Warn().Err(err).Str("code", code).Msg("failed to fetch event for code")
return nil, err
return nil, fmt.Errorf("error fetching event: %w", err)
}
relaysForNip19 := make([]string, 0, 3)

View File

@@ -135,7 +135,7 @@ func getEvent(ctx context.Context, code string, relayHints []string) (*nostr.Eve
if res, _ := wdb.QuerySync(ctx, filter); len(res) != 0 {
evt := res[0]
scheduleEventExpiration(evt.ID, time.Hour*24*7)
return evt, getRelaysForEvent(evt.ID), err
return evt, getRelaysForEvent(evt.ID), nil
}
// otherwise fetch from external relays

View File

@@ -41,7 +41,7 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
_, redirectHex, err := nip19.Decode(code)
if err != nil {
w.Header().Set("Cache-Control", "max-age=60")
http.Error(w, "error fetching event: "+err.Error(), 404)
http.Error(w, "error decoding note1 code: "+err.Error(), 404)
return
}
redirectNevent, _ := nip19.EncodeEvent(redirectHex.(string), []string{}, "")
@@ -58,7 +58,7 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
data, err := grabData(r.Context(), code, false)
if err != nil {
w.Header().Set("Cache-Control", "max-age=60")
http.Error(w, "error fetching event: "+err.Error(), 404)
http.Error(w, "failed to fetch event related data: "+err.Error(), 404)
return
}