From 1ce4d892d3a8c6dc3770c4a2b6055e11360e4b7c Mon Sep 17 00:00:00 2001 From: Chris kerr Date: Wed, 18 Sep 2024 19:51:53 -0400 Subject: [PATCH] change in parameterized replaceable handling --- server/db/mongo/kinds/replaceableParameters.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/server/db/mongo/kinds/replaceableParameters.go b/server/db/mongo/kinds/replaceableParameters.go index cdb8f7e..9d1b59e 100644 --- a/server/db/mongo/kinds/replaceableParameters.go +++ b/server/db/mongo/kinds/replaceableParameters.go @@ -12,7 +12,9 @@ import ( "golang.org/x/net/websocket" ) +// HandleParameterizedReplaceableKind handles parameterized replaceable events based on NIP-01 rules func HandleParameterizedReplaceableKind(ctx context.Context, evt relay.Event, collection *mongo.Collection, ws *websocket.Conn) error { + // Step 1: Find dTag from the event's tags var dTag string for _, tag := range evt.Tags { if len(tag) > 0 && tag[0] == "d" { @@ -20,20 +22,34 @@ func HandleParameterizedReplaceableKind(ctx context.Context, evt relay.Event, co break } } + + // Step 2: Create filter to find the existing event based on pubkey, kind, and dTag filter := bson.M{"pubkey": evt.PubKey, "kind": evt.Kind, "tags.d": dTag} + + // Step 3: Find the existing event from the database var existingEvent relay.Event err := collection.FindOne(ctx, filter).Decode(&existingEvent) if err != nil && err != mongo.ErrNoDocuments { return fmt.Errorf("error finding existing event: %v", err) } + // Step 4: Handle event replacement logic (NIP-01 rules) + // If we found an existing event and the new event is older, reject the update if err != mongo.ErrNoDocuments { if existingEvent.CreatedAt > evt.CreatedAt || (existingEvent.CreatedAt == evt.CreatedAt && existingEvent.ID < evt.ID) { - response.SendOK(ws, evt.ID, false, "blocked: relay already has a newer event for this pubkey and d tag") + response.SendOK(ws, evt.ID, false, "blocked: relay already has a newer event for this pubkey and dTag") return nil } + + // Step 5: Delete the older event if the new event is valid + _, err := collection.DeleteOne(ctx, bson.M{"_id": existingEvent.ID}) + if err != nil { + return fmt.Errorf("error deleting the older event: %v", err) + } + fmt.Printf("Deleted older event with ID: %s\n", existingEvent.ID) } + // Step 6: Upsert the new event (insert if not existing, or update if newer) opts := options.Update().SetUpsert(true) update := bson.M{ "$set": evt,