aljaz/BTCPayServerPlugins
1
0
Fork 0
mirror of https://github.com/aljazceru/BTCPayServerPlugins.git synced 2025-12-17 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix 2.0 warnings and errors

Browse Source
This commit is contained in:
nicolas.dorier
2024-10-27 22:28:45 +09:00
parent b2f2054c23
commit 8a90b11d74
18 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/BTCPayServer.Plugins.Blink/BlinkPlugin.cs
View File

@@ -18,7 +18,7 @@ namespace BTCPayServer.Plugins.Blink
public override void Execute(IServiceCollection applicationBuilder) public override void Execute(IServiceCollection applicationBuilder)
{ {
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Blink/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab")); applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "Blink/LNPaymentMethodSetupTab");
applicationBuilder.AddSingleton<ILightningConnectionStringHandler>(provider => provider.GetRequiredService<BlinkLightningConnectionStringHandler>()); applicationBuilder.AddSingleton<ILightningConnectionStringHandler>(provider => provider.GetRequiredService<BlinkLightningConnectionStringHandler>());
applicationBuilder.AddSingleton<BlinkLightningConnectionStringHandler>(); applicationBuilder.AddSingleton<BlinkLightningConnectionStringHandler>();

13
Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
View File

@@ -21,16 +21,13 @@ namespace BTCPayServer.Plugins.Breez
applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<BreezService>()); applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<BreezService>());
applicationBuilder.AddSingleton<BreezLightningConnectionStringHandler>(); applicationBuilder.AddSingleton<BreezLightningConnectionStringHandler>();
applicationBuilder.AddSingleton<ILightningConnectionStringHandler>(provider => provider.GetRequiredService<BreezLightningConnectionStringHandler>()); applicationBuilder.AddSingleton<ILightningConnectionStringHandler>(provider => provider.GetRequiredService<BreezLightningConnectionStringHandler>());
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/BreezNav", applicationBuilder.AddUIExtension("store-integrations-nav", "Breez/BreezNav");
"store-integrations-nav"));
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/LNPaymentMethodSetupTabhead", "ln-payment-method-setup-tabhead")); applicationBuilder.AddUIExtension("ln-payment-method-setup-tabhead", "Breez/LNPaymentMethodSetupTabhead");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab")); applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "Breez/LNPaymentMethodSetupTab");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/BreezNodeInfo", applicationBuilder.AddUIExtension("dashboard", "Breez/BreezNodeInfo");
"dashboard")); applicationBuilder.AddUIExtension("dashboard", "Breez/BreezPaymentsTable");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Breez/BreezPaymentsTable",
"dashboard"));
base.Execute(applicationBuilder); base.Execute(applicationBuilder);
} }
} }

5
Plugins/BTCPayServer.Plugins.Bringin/BringinPlugin.cs
View File

@@ -21,8 +21,7 @@ public class BringinPlugin : BaseBTCPayServerPlugin
{ {
applicationBuilder.AddSingleton<BringinService>(); applicationBuilder.AddSingleton<BringinService>();
applicationBuilder.AddSingleton<IHostedService, BringinService>(s => s.GetService<BringinService>()); applicationBuilder.AddSingleton<IHostedService, BringinService>(s => s.GetService<BringinService>());
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Bringin/BringinDashboardWidget", "dashboard")); applicationBuilder.AddUIExtension("dashboard", "Bringin/BringinDashboardWidget");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Bringin/Nav", applicationBuilder.AddUIExtension("store-integrations-nav", "Bringin/Nav");
"store-integrations-nav"));
} }
} }

2
Plugins/BTCPayServer.Plugins.Bringin/BringinService.cs
View File

@@ -309,7 +309,7 @@ public class BringinService : EventHostedServiceBase
PayoutMethodId = paymentMethodId, PayoutMethodId = paymentMethodId,
StoreId = storeId, StoreId = storeId,
Destination = destination, Destination = destination,
Value = orderMoney.ToUnit(MoneyUnit.BTC), ClaimedAmount = orderMoney.ToUnit(MoneyUnit.BTC),
PreApprove = true, PreApprove = true,
Metadata = JObject.FromObject(new Metadata = JObject.FromObject(new
{ {

3
Plugins/BTCPayServer.Plugins.DataErasure/DataErasurePlugin.cs
View File

@@ -15,8 +15,7 @@ namespace BTCPayServer.Plugins.DataErasure
{ {
applicationBuilder.AddSingleton<DataErasureService>(); applicationBuilder.AddSingleton<DataErasureService>();
applicationBuilder.AddHostedService( sp => sp.GetRequiredService<DataErasureService>()); applicationBuilder.AddHostedService( sp => sp.GetRequiredService<DataErasureService>());
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("DataErasure/DataErasureNav", applicationBuilder.AddUIExtension("store-integrations-nav", "DataErasure/DataErasureNav");
"store-integrations-nav"));
base.Execute(applicationBuilder); base.Execute(applicationBuilder);
} }
} }

3
Plugins/BTCPayServer.Plugins.DynamicRateLimits/DynamicRateLimitsPlugin.cs
View File

@@ -16,8 +16,7 @@ public class DynamicRateLimitsPlugin : BaseBTCPayServerPlugin
{ {
applicationBuilder.AddSingleton<DynamicRateLimitsService>(); applicationBuilder.AddSingleton<DynamicRateLimitsService>();
applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<DynamicRateLimitsService>()); applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<DynamicRateLimitsService>());
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("DynamicRateLimitsPlugin/Nav", applicationBuilder.AddUIExtension("server-nav", "DynamicRateLimitsPlugin/Nav");
"server-nav"));
base.Execute(applicationBuilder); base.Execute(applicationBuilder);
} }
} }

3
Plugins/BTCPayServer.Plugins.DynamicReports/DynamicReportsPlugin.cs
View File

@@ -16,8 +16,7 @@ public class DynamicReportsPlugin : BaseBTCPayServerPlugin
{ {
applicationBuilder.AddSingleton<DynamicReportService>(); applicationBuilder.AddSingleton<DynamicReportService>();
applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<DynamicReportService>()); applicationBuilder.AddSingleton<IHostedService>(provider => provider.GetRequiredService<DynamicReportService>());
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("DynamicReportsPlugin/Nav", applicationBuilder.AddUIExtension("server-nav", "DynamicReportsPlugin/Nav");
"server-nav"));
base.Execute(applicationBuilder); base.Execute(applicationBuilder);
} }
} }

10
Plugins/BTCPayServer.Plugins.FileSeller/FileSellerPlugin.cs
View File

@@ -15,13 +15,9 @@ public class FileSellerPlugin : BaseBTCPayServerPlugin
public override void Execute(IServiceCollection applicationBuilder) public override void Execute(IServiceCollection applicationBuilder)
{ {
applicationBuilder.AddHostedService<FileSellerService>(); applicationBuilder.AddHostedService<FileSellerService>();
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("FileSeller/Detect", applicationBuilder.AddUIExtension("header-nav", "FileSeller/Detect");
"header-nav")); applicationBuilder.AddUIExtension("checkout-end", "FileSeller/Detect");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("FileSeller/Detect", applicationBuilder.AddUIExtension("app-template-editor-item-detail", "FileSeller/FileSellerTemplateEditorItemDetail");
"checkout-end"));
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("FileSeller/FileSellerTemplateEditorItemDetail",
"app-template-editor-item-detail"));
base.Execute(applicationBuilder); base.Execute(applicationBuilder);
} }

6
Plugins/BTCPayServer.Plugins.MicroNode/MicroNodePlugin.cs
View File

@@ -18,9 +18,9 @@ public class MicroNodePlugin:BaseBTCPayServerPlugin
public override void Execute(IServiceCollection applicationBuilder) public override void Execute(IServiceCollection applicationBuilder)
{ {
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("MicroNode/MicroNodeNav", "header-nav")); applicationBuilder.AddUIExtension("header-nav", "MicroNode/MicroNodeNav");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("MicroNode/LNPaymentMethodSetupTabhead", "ln-payment-method-setup-tabhead")); applicationBuilder.AddUIExtension("ln-payment-method-setup-tabhead", "MicroNode/LNPaymentMethodSetupTabhead");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("MicroNode/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab")); applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "MicroNode/LNPaymentMethodSetupTab");
// applicationBuilder.AddStartupTask<MicroNodeStartupTask>(); // applicationBuilder.AddStartupTask<MicroNodeStartupTask>();
applicationBuilder.AddSingleton<MicroNodeContextFactory>(); applicationBuilder.AddSingleton<MicroNodeContextFactory>();
applicationBuilder.AddDbContext<MicroNodeContext>((provider, o) => applicationBuilder.AddDbContext<MicroNodeContext>((provider, o) =>

2
Plugins/BTCPayServer.Plugins.MicroNode/MicroNodeService.cs
View File

@@ -620,7 +620,7 @@ public class MicroNodeService : EventHostedServiceBase
} }
var payout = await _pullPaymentHostedService.Claim(new ClaimRequest() var payout = await _pullPaymentHostedService.Claim(new ClaimRequest()
{ {
Value = LightMoney.MilliSatoshis(balance.MilliSatoshi).ToDecimal(LightMoneyUnit.BTC), ClaimedAmount = LightMoney.MilliSatoshis(balance.MilliSatoshi).ToDecimal(LightMoneyUnit.BTC),
StoreId = masterClients.Key, StoreId = masterClients.Key,
Destination = new LNURLPayClaimDestinaton(destination), Destination = new LNURLPayClaimDestinaton(destination),
PreApprove = true, PreApprove = true,

5
Plugins/BTCPayServer.Plugins.NIP05/Nip05Plugin.cs
View File

@@ -18,9 +18,8 @@ namespace BTCPayServer.Plugins.NIP05
public override void Execute(IServiceCollection applicationBuilder) public override void Execute(IServiceCollection applicationBuilder)
{ {
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Nip05Nav", applicationBuilder.AddUIExtension("store-integrations-nav", "Nip05Nav");
"store-integrations-nav")); applicationBuilder.AddUIExtension("ln-payment-method-setup-tab", "NWC/LNPaymentMethodSetupTab");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("NWC/LNPaymentMethodSetupTab", "ln-payment-method-setup-tab"));
applicationBuilder.AddSingleton<IPluginHookFilter, LnurlDescriptionFilter>(); applicationBuilder.AddSingleton<IPluginHookFilter, LnurlDescriptionFilter>();
applicationBuilder.AddSingleton<IPluginHookFilter, LnurlFilter>(); applicationBuilder.AddSingleton<IPluginHookFilter, LnurlFilter>();

3
Plugins/BTCPayServer.Plugins.Prism/PrismPlugin.cs
View File

@@ -18,8 +18,7 @@ public class PrismPlugin : BaseBTCPayServerPlugin
{ {
applicationBuilder.AddServerSideBlazor(o => o.DetailedErrors = true); applicationBuilder.AddServerSideBlazor(o => o.DetailedErrors = true);
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("PrismNav", applicationBuilder.AddUIExtension("store-integrations-nav", "PrismNav");
"store-integrations-nav"));
applicationBuilder.AddSingleton<SatBreaker>(); applicationBuilder.AddSingleton<SatBreaker>();
applicationBuilder.AddHostedService(provider => provider.GetRequiredService<SatBreaker>()); applicationBuilder.AddHostedService(provider => provider.GetRequiredService<SatBreaker>());
applicationBuilder.AddSingleton<IPluginHookFilter, OpenSatsDestinationValidator>(); applicationBuilder.AddSingleton<IPluginHookFilter, OpenSatsDestinationValidator>();

2
Plugins/BTCPayServer.Plugins.Prism/SatBreaker.cs
View File

@@ -547,7 +547,7 @@ namespace BTCPayServer.Plugins.Prism
PreApprove = true, PreApprove = true,
StoreId = storeId, StoreId = storeId,
PayoutMethodId = pmi, PayoutMethodId = pmi,
Value = Money.Satoshis(payoutAmount).ToDecimal(MoneyUnit.BTC), ClaimedAmount = Money.Satoshis(payoutAmount).ToDecimal(MoneyUnit.BTC),
Metadata = JObject.FromObject(new Metadata = JObject.FromObject(new
{ {
Source = source Source = source

2
Plugins/BTCPayServer.Plugins.Subscriptions/SubscriptionPlugin.cs
View File

@@ -26,7 +26,7 @@ namespace BTCPayServer.Plugins.Subscriptions
applicationBuilder.AddSingleton<IWebhookProvider>(o => o.GetRequiredService<SubscriptionService>()); applicationBuilder.AddSingleton<IWebhookProvider>(o => o.GetRequiredService<SubscriptionService>());
applicationBuilder.AddHostedService(s => s.GetRequiredService<SubscriptionService>()); applicationBuilder.AddHostedService(s => s.GetRequiredService<SubscriptionService>());
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Subscriptions/NavExtension", "header-nav")); applicationBuilder.AddUIExtension("header-nav", "Subscriptions/NavExtension");
applicationBuilder.AddSingleton<AppBaseType, SubscriptionApp>(); applicationBuilder.AddSingleton<AppBaseType, SubscriptionApp>();
base.Execute(applicationBuilder); base.Execute(applicationBuilder);
} }

2
Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs
View File

@@ -22,7 +22,7 @@ namespace BTCPayServer.Plugins.TicketTailor
applicationBuilder.AddSingleton<IWebhookProvider>(o => o.GetRequiredService<TicketTailorService>()); applicationBuilder.AddSingleton<IWebhookProvider>(o => o.GetRequiredService<TicketTailorService>());
applicationBuilder.AddHostedService(s => s.GetRequiredService<TicketTailorService>()); applicationBuilder.AddHostedService(s => s.GetRequiredService<TicketTailorService>());
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("TicketTailor/NavExtension", "header-nav")); applicationBuilder.AddUIExtension("header-nav", "TicketTailor/NavExtension");
applicationBuilder.AddSingleton<AppBaseType, TicketTailorApp>(); applicationBuilder.AddSingleton<AppBaseType, TicketTailorApp>();
base.Execute(applicationBuilder); base.Execute(applicationBuilder);
} }

3
Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/CoordinatorExtensions.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Buffers; using System.Buffers;
using BTCPayServer;
using BTCPayServer.Abstractions.Contracts; using BTCPayServer.Abstractions.Contracts;
using BTCPayServer.Abstractions.Services; using BTCPayServer.Abstractions.Services;
using BTCPayServer.Configuration; using BTCPayServer.Configuration;
@@ -40,7 +41,7 @@ public static class CoordinatorExtensions
}); });
services.AddHostedService((sp) => sp.GetRequiredService<WabisabiCoordinatorService>()); services.AddHostedService((sp) => sp.GetRequiredService<WabisabiCoordinatorService>());
services.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiServerNavvExtension", "server-nav")); services.AddUIExtension("server-nav", "Wabisabi/WabisabiServerNavvExtension");
services.AddHttpClient("wabisabi-coordinator-scripts-no-redirect.onion") services.AddHttpClient("wabisabi-coordinator-scripts-no-redirect.onion")

12
Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
View File

@@ -55,14 +55,10 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
applicationBuilder.AddSingleton<IWalletProvider>(provider => provider.GetRequiredService<WalletProvider>()); applicationBuilder.AddSingleton<IWalletProvider>(provider => provider.GetRequiredService<WalletProvider>());
applicationBuilder.AddHostedService(provider => provider.GetRequiredService<WalletProvider>()); applicationBuilder.AddHostedService(provider => provider.GetRequiredService<WalletProvider>());
; ;
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/StoreIntegrationWabisabiOption", applicationBuilder.AddUIExtension("store-integrations-list", "Wabisabi/StoreIntegrationWabisabiOption");
"store-integrations-list")); applicationBuilder.AddUIExtension("store-integrations-nav", "Wabisabi/WabisabiNav");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiNav", applicationBuilder.AddUIExtension("dashboard", "Wabisabi/WabisabiDashboard");
"store-integrations-nav")); applicationBuilder.AddUIExtension("onchain-wallet-send", "Wabisabi/WabisabiWalletSend");
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiDashboard",
"dashboard"));
applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Wabisabi/WabisabiWalletSend",
"onchain-wallet-send"));
applicationBuilder.AddSingleton<IPayoutProcessorFactory, WabisabiPayoutProcessor>(); applicationBuilder.AddSingleton<IPayoutProcessorFactory, WabisabiPayoutProcessor>();
Logger.SetMinimumLevel(LogLevel.Info); Logger.SetMinimumLevel(LogLevel.Info);

2
submodules/btcpayserver

Submodule submodules/btcpayserver updated: 74011e50e3...41a2241ae1