From 1ffe90da2f4e02fd16099afa63003fcfaec65e54 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 2 Jul 2025 23:28:30 +0900
Subject: [PATCH 1/3] Fix: BlinkLightningClient.GetInvoice should not crash
 when the invoice is not found

---
 Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs b/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs
index aea7422..856e6d4 100644
--- a/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs
+++ b/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs
@@ -179,9 +179,8 @@ query InvoiceByPaymentHash($paymentHash: PaymentHash!, $walletId: WalletId!) {
             }
         };
         var response = await _client.SendQueryAsync<dynamic>(reques,  cancellation);
-        
-
-        return response.Data is null ? null : ToInvoice(response.Data.me.defaultAccount.walletById.invoiceByPaymentHash);
+        var result = response.Data?.SelectToken("me.defaultAccount.walletById.invoiceByPaymentHash") as JObject;
+        return result is null ? null : ToInvoice(result);
     }
 
     public LightningInvoice? ToInvoice(JObject invoice)

From dd6d386af786c5158dd1f76101a7dd4fcaafad0b Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 3 Jul 2025 22:17:30 +0900
Subject: [PATCH 2/3] Fix: BOLT11 had improper expiry time

---
 Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs b/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs
index aea7422..f58c197 100644
--- a/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs
+++ b/Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs
@@ -451,11 +451,11 @@ mutation lnInvoiceCreate($input: LnInvoiceCreateOnBehalfOfRecipientInput!) {
                     memo = createInvoiceRequest.Description,
                     descriptionHash = createInvoiceRequest.DescriptionHash?.ToString(),
                     amount = (long)createInvoiceRequest.Amount.ToUnit(LightMoneyUnit.Satoshi),
-expiresIn = (int)createInvoiceRequest.Expiry.TotalMinutes
-                    
+                    expiresIn = (int)createInvoiceRequest.Expiry.TotalMinutes
                 }
             }
         };
+
         var response = await _client.SendQueryAsync<dynamic>(reques,  cancellation);
         var inv = (isUSD
             ? response.Data.lnUsdInvoiceBtcDenominatedCreateOnBehalfOfRecipient.invoice

From 3063353e3152bb72911ddcb86ec25cd06246360c Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Sat, 5 Jul 2025 15:01:46 +0900
Subject: [PATCH 3/3] Fix ticket tailor for 2.1.6

---
 .../BTCPayServer.Plugins.TicketTailor.csproj                    | 2 +-
 Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs | 2 +-
 .../BTCPayServer.Plugins.TicketTailor/TicketTailorService.cs    | 2 ++
 submodules/btcpayserver                                         | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj b/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj
index 734fe63..7bad1f2 100644
--- a/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj
+++ b/Plugins/BTCPayServer.Plugins.TicketTailor/BTCPayServer.Plugins.TicketTailor.csproj
@@ -9,7 +9,7 @@
     <PropertyGroup>
         <Product>TicketTailor</Product>
         <Description>Allows you to integrate with TicketTailor.com to sell tickets for Bitcoin</Description>
-        <Version>2.0.5</Version>
+        <Version>2.0.6</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
     <!-- Plugin development properties -->
diff --git a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs
index 4f4c850..065120e 100644
--- a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorPlugin.cs
@@ -12,7 +12,7 @@ namespace BTCPayServer.Plugins.TicketTailor
     {
         public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } =
         {
-            new() {Identifier = nameof(BTCPayServer), Condition = ">=2.0.0"}
+            new() {Identifier = nameof(BTCPayServer), Condition = ">=2.1.6"}
         };
 
         public override void Execute(IServiceCollection applicationBuilder)
diff --git a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorService.cs b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorService.cs
index f8525b2..e3ae1e1 100644
--- a/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorService.cs
+++ b/Plugins/BTCPayServer.Plugins.TicketTailor/TicketTailorService.cs
@@ -339,6 +339,8 @@ public class TicketTailorService : EventHostedServiceBase, IWebhookProvider
 
     public const string TicketTailorTicketIssued = "TicketTailorTicketIssued";
 
+    public bool SupportsCustomerEmail { get; } = true;
+
     public Dictionary<string, string> GetSupportedWebhookTypes()
     {
         return new Dictionary<string, string>
diff --git a/submodules/btcpayserver b/submodules/btcpayserver
index ba8feed..f4df963 160000
--- a/submodules/btcpayserver
+++ b/submodules/btcpayserver
@@ -1 +1 @@
-Subproject commit ba8feeddd990cb2e66b028709e0d5f9159437826
+Subproject commit f4df9632e60dfe05663e461439cb3ec50275e996