From b903f72945921648deec345e50eea144d42b3d46 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Thu, 3 Nov 2022 14:30:53 -0300 Subject: [PATCH] never store ephemeral events. --- handlers.go | 22 +++++++++++++--------- storage/postgresql/save.go | 7 ------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/handlers.go b/handlers.go index ddbd28e..b785d1f 100644 --- a/handlers.go +++ b/handlers.go @@ -162,17 +162,21 @@ func handleWebsocket(relay Relay) func(http.ResponseWriter, *http.Request) { return } - if advancedSaver != nil { - advancedSaver.BeforeSave(&evt) - } + if 20000 <= evt.Kind && evt.Kind < 30000 { + // do not store ephemeral events + } else { + if advancedSaver != nil { + advancedSaver.BeforeSave(&evt) + } - if err := store.SaveEvent(&evt); err != nil { - notice = err.Error() - return - } + if err := store.SaveEvent(&evt); err != nil { + notice = err.Error() + return + } - if advancedSaver != nil { - advancedSaver.AfterSave(&evt) + if advancedSaver != nil { + advancedSaver.AfterSave(&evt) + } } notifyListeners(&evt) diff --git a/storage/postgresql/save.go b/storage/postgresql/save.go index 7381c4e..a2486ca 100644 --- a/storage/postgresql/save.go +++ b/storage/postgresql/save.go @@ -4,7 +4,6 @@ import ( "encoding/json" "fmt" "strings" - "time" "github.com/fiatjaf/go-nostr" ) @@ -35,11 +34,5 @@ func (b *PostgresBackend) SaveEvent(evt *nostr.Event) error { return fmt.Errorf("failed to save event %s: %w", evt.ID, err) } - // delete ephemeral events after a minute - go func() { - time.Sleep(75 * time.Second) - b.DB.Exec("DELETE FROM event WHERE id = $1", evt.ID) - }() - return nil }