Remove the lightning prefix from the lnInvoice

bot/bot_utils.js

@@ -0,0 +1,15 @@
+const removeLightningPrefix = function (invoice) {
+    const prefix = 'lightning:';
+
+    // Check if the invoice starts with the prefix
+    if (invoice.startsWith(prefix)) {
+        return invoice.substring(prefix.length);
+    }
+
+    // Return the invoice as is if no prefix is found
+    return invoice;
+};
+
+module.exports = {
+    removeLightningPrefix
+};

bot/commands.js

@@ -21,6 +21,7 @@ const OrderEvents = require('./modules/events/orders');
 
 const { resolvLightningAddress } = require('../lnurl/lnurl-pay');
 const { logger } = require('../logger');
+const { removeLightningPrefix } = require('./bot_utils');
 
 const waitPayment = async (ctx, bot, buyer, seller, order, buyerInvoice) => {
   try {
@@ -32,7 +33,8 @@ const waitPayment = async (ctx, bot, buyer, seller, order, buyerInvoice) => {
       return;
     }
 
-    order.buyer_invoice = buyerInvoice;
+    // ISSUE: 542
+    order.buyer_invoice = removeLightningPrefix(buyerInvoice);
     // We need the i18n context to send the message with the correct language
     const i18nCtx = await getUserI18nContext(seller);
     // If the buyer is the creator, at this moment the seller already paid the hold invoice

bot/validations.js

@@ -5,6 +5,7 @@ const { Order, User, Community } = require('../models');
 const { isIso4217, isDisputeSolver } = require('../util');
 const { existLightningAddress } = require('../lnurl/lnurl-pay');
 const { logger } = require('../logger');
+const { removeLightningPrefix } = require('./bot_utils');
 
 // We look in database if the telegram user exists,
 // if not, it creates a new user
@@ -305,7 +306,11 @@ const validateLightningAddress = async lightningAddress => {
 
 const validateInvoice = async (ctx, lnInvoice) => {
   try {
-    const invoice = parsePaymentRequest({ request: lnInvoice });
+    // ISSUE: 542
+
+    const checkedPrefixlnInvoice = removeLightningPrefix(lnInvoice);
+    const invoice = parsePaymentRequest({ request: checkedPrefixlnInvoice });
+
     const latestDate = new Date(
       Date.now() + parseInt(process.env.INVOICE_EXPIRATION_WINDOW)
     ).toISOString();
@@ -344,7 +349,11 @@ const validateInvoice = async (ctx, lnInvoice) => {
 
 const isValidInvoice = async (ctx, lnInvoice) => {
   try {
-    const invoice = parsePaymentRequest({ request: lnInvoice });
+    // ISSUE: 542
+
+    const checkedPrefixlnInvoice = removeLightningPrefix(lnInvoice);
+    const invoice = parsePaymentRequest({ request: checkedPrefixlnInvoice });
+
     const latestDate = new Date(
       Date.now() + parseInt(process.env.INVOICE_EXPIRATION_WINDOW)
     ).toISOString();