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

fix parameterized replaceable

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2024-07-16 00:20:06 +09:00
parent 3d6e7b6778
commit fd5b79fca2
1 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
relay_interface.go
View File

@@ -23,25 +23,53 @@ func (w RelayWrapper) Publish(ctx context.Context, evt nostr.Event) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to query before replacing: %w", err) return fmt.Errorf("failed to query before replacing: %w", err)
} }
if previous := <-ch; previous != nil && isOlder(previous, &evt) { isNewer := true
if err := w.Store.DeleteEvent(ctx, previous); err != nil { for previous := range ch {
return fmt.Errorf("failed to delete event for replacing: %w", err) if previous == nil {
continue
} }
if isOlder(previous, &evt) {
if err := w.Store.DeleteEvent(ctx, previous); err != nil {
return fmt.Errorf("failed to delete event for replacing: %w", err)
}
} else {
// already, newer event is stored.
isNewer = false
break
}
}
if !isNewer {
return nil
} }
} else if 30000 <= evt.Kind && evt.Kind < 40000 { } else if 30000 <= evt.Kind && evt.Kind < 40000 {
// parameterized replaceable event, delete before storing // parameterized replaceable event, delete before storing
d := evt.Tags.GetFirst([]string{"d", ""}) d := evt.Tags.GetFirst([]string{"d", ""})
if d != nil { if d != nil {
ch, err := w.Store.QueryEvents(ctx, nostr.Filter{Authors: []string{evt.PubKey}, Kinds: []int{evt.Kind}, Tags: nostr.TagMap{"d": []string{d.Value()}}}) return fmt.Errorf("failed to add event missing d tag for parameterized replacing")
if err != nil { }
return fmt.Errorf("failed to query before parameterized replacing: %w", err) ch, err := w.Store.QueryEvents(ctx, nostr.Filter{Authors: []string{evt.PubKey}, Kinds: []int{evt.Kind}, Tags: nostr.TagMap{"d": []string{d.Value()}}})
if err != nil {
return fmt.Errorf("failed to query before parameterized replacing: %w", err)
}
isNewer := true
for previous := range ch {
if previous == nil {
continue
} }
if previous := <-ch; previous != nil && isOlder(previous, &evt) {
if !isOlder(previous, &evt) {
if err := w.Store.DeleteEvent(ctx, previous); err != nil { if err := w.Store.DeleteEvent(ctx, previous); err != nil {
return fmt.Errorf("failed to delete event for parameterized replacing: %w", err) return fmt.Errorf("failed to delete event for parameterized replacing: %w", err)
} }
} else {
// already, newer event is stored.
isNewer = false
break
} }
} }
if !isNewer {
return nil
}
} }
if err := w.SaveEvent(ctx, &evt); err != nil && err != ErrDupEvent { if err := w.SaveEvent(ctx, &evt); err != nil && err != ErrDupEvent {