aljaz/BTCPayServerPlugins
1
0
Fork 0
mirror of https://github.com/aljazceru/BTCPayServerPlugins.git synced 2026-01-31 13:34:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Kukks
2024-05-15 13:59:49 +02:00
parent a93c97d63d
commit 9cd7467a13
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
View File

@@ -13,7 +13,7 @@
<PropertyGroup>
<Product>Coinjoin</Product>
<Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
<Version>1.0.83</Version>
<Version>1.0.84</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

13
Plugins/BTCPayServer.Plugins.Wabisabi/Nostr.cs
View File

@@ -84,7 +84,6 @@ public class Nostr
}
});
var result = new List<NostrEvent>();
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<string, JsonElement>()
{
["#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()

2
Plugins/BTCPayServer.Plugins.Wabisabi/Views/Shared/Wabisabi/AddCoordinatorPrompt.cshtml
View File

@@ -36,7 +36,7 @@
<div class="modal-body">
<div class="form-group">
<label class="form-label">Nostr Relay</label>
<input type="url" class="form-control" asp-for="Relay" required="required" value="wss://kukks.org/nostr">
<input type="url" class="form-control" asp-for="Relay" required="required" value="wss://relay.primal.net">
</div>
</div>