diff --git a/Plugins/BTCPayServer.Plugins.Prism/OpenSatsDestinationValidator.cs b/Plugins/BTCPayServer.Plugins.Prism/OpenSatsDestinationValidator.cs index ac52334..6613a73 100644 --- a/Plugins/BTCPayServer.Plugins.Prism/OpenSatsDestinationValidator.cs +++ b/Plugins/BTCPayServer.Plugins.Prism/OpenSatsDestinationValidator.cs @@ -23,13 +23,13 @@ public class OpenSatsDestinationValidator : IPluginHookFilter public async Task Execute(object args) { var result = new PrismDestinationValidationResult(); - if (args is not string args1 || !args1.StartsWith("opensats")) return args; + if (args is not string args1 || !args1.StartsWith("opensats", StringComparison.InvariantCultureIgnoreCase)) return args; try { - var parts = args1.Split(":", StringSplitOptions.RemoveEmptyEntries); - var project = "opensats"; + var parts = args1.ToLowerInvariant().Split(":", StringSplitOptions.RemoveEmptyEntries); + var project = "general_fund"; var paymentMethod = new PaymentMethodId("BTC", PaymentTypes.LightningLike); if (parts.Length > 1) { @@ -69,7 +69,7 @@ public class OpenSatsDestinationValidator : IPluginHookFilter result.Success = false; } - + result.Success = true; result.PaymentMethod = paymentMethod; diff --git a/Plugins/BTCPayServer.Plugins.Prism/OpenSatsPrismClaimCreate.cs b/Plugins/BTCPayServer.Plugins.Prism/OpenSatsPrismClaimCreate.cs index 8ecdc46..3fb8dd5 100644 --- a/Plugins/BTCPayServer.Plugins.Prism/OpenSatsPrismClaimCreate.cs +++ b/Plugins/BTCPayServer.Plugins.Prism/OpenSatsPrismClaimCreate.cs @@ -74,6 +74,7 @@ public class OpenSatsPrismClaimCreate : IPluginHookFilter var invoiceUrl = $"{rawInvoice.Value("checkoutLink").TrimEnd('/')}/{paymentMethod}/status"; var invoiceBtcpayModel = JObject.Parse(await httpClient.GetStringAsync(invoiceUrl).ConfigureAwait(false)); var destination = invoiceBtcpayModel.Value("btcAddress"); + var receiptLink = invoiceBtcpayModel.Value("receiptLink"); var claimDestination = await handler.ParseClaimDestination(paymentMethod,destination, CancellationToken.None); if (claimDestination.destination is null) @@ -81,7 +82,11 @@ public class OpenSatsPrismClaimCreate : IPluginHookFilter return null; } - + claimRequest.Metadata = JObject.FromObject(new + { + Source = $"Prism->OpenSats ({project}", + SourceLink = receiptLink + }); claimRequest.Destination = claimDestination.destination; claimRequest.PaymentMethodId = paymentMethod;