diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj index 683657f..27e1dd2 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj @@ -13,7 +13,7 @@ Coinjoin Allows you to integrate your btcpayserver store with coinjoins. - 1.0.83 + 1.0.84 true diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Nostr.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/Nostr.cs index 4d35eb7..3080d20 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/Nostr.cs +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Nostr.cs @@ -84,7 +84,6 @@ public class Nostr } }); var result = new List(); - var network = currentNetwork.ChainName.ToString().ToLower(); var cts = CancellationTokenSource.CreateLinkedTokenSource(new CancellationTokenSource(TimeSpan.FromSeconds(30)).Token, cancellationToken); @@ -99,7 +98,7 @@ public class Nostr Kinds = new[] {Kind}, ExtensionData = new Dictionary() { - ["#type"] = JsonSerializer.SerializeToElement(new[] {TypeTagValue}), + // ["#type"] = JsonSerializer.SerializeToElement(new[] {TypeTagValue}), // ["#network"] = JsonSerializer.SerializeToElement(new[] {network, currentNetwork.Name.ToLower()}) }, Limit = 1000 @@ -107,7 +106,7 @@ public class Nostr }, true, cts.Token).ToListAsync(cancellationToken); nostrClient.Dispose(); - +var network = new []{currentNetwork.ChainName.ToString().ToLower(), currentNetwork.Name.ToLower()}; return result.Where(@event => @event.PublicKey != ourPubKey && @event.Verify() && @@ -115,10 +114,10 @@ public class Nostr tag.TagIdentifier == EndpointTagIdentifier && tag.Data.Any(s => Uri.IsWellFormedUriString(s, UriKind.Absolute))) && @event.Tags.Any(tag => - tag.TagIdentifier == TypeTagIdentifier && - tag.Data.FirstOrDefault() == TypeTagValue) && - @event.Tags.Any(tag => - tag.TagIdentifier == NetworkTagIdentifier && tag.Data.FirstOrDefault()?.Equals(network, StringComparison.InvariantCultureIgnoreCase) is true) + tag.TagIdentifier.Equals(TypeTagIdentifier, StringComparison.InvariantCultureIgnoreCase) && + tag.Data.Any(tag => tag.Equals(TypeTagValue, StringComparison.InvariantCultureIgnoreCase)) && + @event.Tags.Any(tag => tag.TagIdentifier.Equals(NetworkTagIdentifier, StringComparison.InvariantCultureIgnoreCase) && + tag.Data.Any(s => network.Contains(s, StringComparer.InvariantCultureIgnoreCase)))) ).OrderByDescending(@event => @event.CreatedAt) .DistinctBy(@event => @event.PublicKey) .Select(@event => new DiscoveredCoordinator() diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/AddCoordinatorPrompt.cshtml b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/AddCoordinatorPrompt.cshtml index bae41fb..73c6300 100644 --- a/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/AddCoordinatorPrompt.cshtml +++ b/Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/AddCoordinatorPrompt.cshtml @@ -36,7 +36,7 @@