mirror of
https://github.com/aljazceru/njump.git
synced 2026-01-31 11:44:34 +01:00
improve error messages and fix wrong error being returned.
This commit is contained in:
2
data.go
2
data.go
@@ -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)
|
||||
|
||||
2
nostr.go
2
nostr.go
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user