mleku/eventstore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix RelayInterface.Publish() to not try to delete things all the time.

Browse Source
This commit is contained in:
fiatjaf
2023-11-07 14:13:02 -03:00
parent 58e53aa004
commit b502aa1a7e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
relay_interface.go
View File

@@ -29,7 +29,7 @@ func (w RelayWrapper) Publish(ctx context.Context, evt nostr.Event) (nostr.Statu
if err != nil { if err != nil {
return nostr.PublishStatusFailed, fmt.Errorf("failed to query before replacing: %w", err) return nostr.PublishStatusFailed, fmt.Errorf("failed to query before replacing: %w", err)
} }
if previous := <-ch; previous != nil { if previous := <-ch; previous != nil && isOlder(previous, &evt) {
if err := w.Store.DeleteEvent(ctx, previous); err != nil { if err := w.Store.DeleteEvent(ctx, previous); err != nil {
return nostr.PublishStatusFailed, fmt.Errorf("failed to delete event for replacing: %w", err) return nostr.PublishStatusFailed, fmt.Errorf("failed to delete event for replacing: %w", err)
} }
@@ -42,7 +42,7 @@ func (w RelayWrapper) Publish(ctx context.Context, evt nostr.Event) (nostr.Statu
if err != nil { if err != nil {
return nostr.PublishStatusFailed, fmt.Errorf("failed to query before parameterized replacing: %w", err) return nostr.PublishStatusFailed, fmt.Errorf("failed to query before parameterized replacing: %w", err)
} }
if previous := <-ch; previous != nil { if previous := <-ch; previous != nil && isOlder(previous, &evt) {
if err := w.Store.DeleteEvent(ctx, previous); err != nil { if err := w.Store.DeleteEvent(ctx, previous); err != nil {
return nostr.PublishStatusFailed, return nostr.PublishStatusFailed,
fmt.Errorf("failed to delete event for parameterized replacing: %w", err) fmt.Errorf("failed to delete event for parameterized replacing: %w", err)
@@ -51,7 +51,7 @@ func (w RelayWrapper) Publish(ctx context.Context, evt nostr.Event) (nostr.Statu
} }
} }
if err := w.SaveEvent(ctx, &evt); err != nil { if err := w.SaveEvent(ctx, &evt); err != nil && err != ErrDupEvent {
return nostr.PublishStatusFailed, fmt.Errorf("failed to save: %w", err) return nostr.PublishStatusFailed, fmt.Errorf("failed to save: %w", err)
} }

8
utils.go Normal file
View File

@@ -0,0 +1,8 @@
package eventstore
import "github.com/nbd-wtf/go-nostr"
func isOlder(previous, next *nostr.Event) bool {
return previous.CreatedAt < next.CreatedAt ||
(previous.CreatedAt == next.CreatedAt && previous.ID > next.ID)
}