From 3ee63203122ce0d717b9740b94138f62f99767f5 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Wed, 21 Jan 2026 23:17:00 -0300 Subject: [PATCH] bunker: ignore duplicates caused by switch_relays. --- bunker.go | 9 +++++++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bunker.go b/bunker.go index 271d52d..ffdcd19 100644 --- a/bunker.go +++ b/bunker.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/hex" + "errors" "fmt" "net" "net/url" @@ -356,7 +357,7 @@ var bunker = &cli.Command{ if err != nil { continue } - log("- got nostrconnect:// request from '%s': %s\n", color.New(color.Bold, color.FgBlue).Sprint(clientPublicKey), uri.String()) + log("- got nostrconnect:// request from '%s': %s\n", color.New(color.Bold, color.FgBlue).Sprint(clientPublicKey.Hex()), uri.String()) relays := uri.Query()["relay"] @@ -448,7 +449,11 @@ var bunker = &cli.Command{ from := ie.Event.PubKey req, resp, eventResponse, err := signer.HandleRequest(ctx, ie.Event) if err != nil { - log("< failed to handle request from %s: %s\n", from, err.Error()) + if errors.Is(err, nip46.AlreadyHandled) { + continue + } + + log("< failed to handle request from %s: %s\n", from.Hex(), err.Error()) continue } diff --git a/go.mod b/go.mod index bcded08..7af8844 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/fiatjaf/nak go 1.25 require ( - fiatjaf.com/nostr v0.0.0-20260121154330-061cf7f68fd4 + fiatjaf.com/nostr v0.0.0-20260122014616-241959d1e3f4 github.com/AlecAivazis/survey/v2 v2.3.7 github.com/bep/debounce v1.2.1 github.com/btcsuite/btcd/btcec/v2 v2.3.6 diff --git a/go.sum b/go.sum index 6e9a334..ab0fec0 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ fiatjaf.com/lib v0.3.2 h1:RBS41z70d8Rp8e2nemQsbPY1NLLnEGShiY2c+Bom3+Q= fiatjaf.com/lib v0.3.2/go.mod h1:UlHaZvPHj25PtKLh9GjZkUHRmQ2xZ8Jkoa4VRaLeeQ8= -fiatjaf.com/nostr v0.0.0-20260121154330-061cf7f68fd4 h1:DF/4NSbCvXqIIRrwYp7L3S0SqC7/IhQl8mHkmYA5uXM= -fiatjaf.com/nostr v0.0.0-20260121154330-061cf7f68fd4/go.mod h1:ue7yw0zHfZj23Ml2kVSdBx0ENEaZiuvGxs/8VEN93FU= +fiatjaf.com/nostr v0.0.0-20260122014616-241959d1e3f4 h1:1KAEp9ktrnm7pB/o2QrdRT3dJyXYwei8N9RRRppiMFY= +fiatjaf.com/nostr v0.0.0-20260122014616-241959d1e3f4/go.mod h1:ue7yw0zHfZj23Ml2kVSdBx0ENEaZiuvGxs/8VEN93FU= github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/FastFilter/xorfilter v0.2.1 h1:lbdeLG9BdpquK64ZsleBS8B4xO/QW1IM0gMzF7KaBKc=