GlcoinCore/alby-hub
1
0
Fork 0
mirror of https://github.com/getAlby/hub.git synced 2026-08-13 12:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: remove unneeded changes
Some checks are pending
Multiplatform Docker build & push / build (push) Waiting to run
Details

Browse source
This commit is contained in:
fmar 2026-06-01 23:06:35 +02:00
parent 1418e1654c
commit 17e97c5639
1 changed files with 13 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

63
transactions/transactions_service.go
View file

@ -152,13 +152,21 @@ func (svc *transactionsService) MakeInvoice(ctx context.Context, amountMsat uint
"metadata": metadata,
}).Debug("Making invoice")
combinedMetadata := map[string]interface{}{}
for key, value := range metadata {
combinedMetadata[key] = value
var metadataBytes []byte
if metadata != nil {
var err error
metadataBytes, err = json.Marshal(metadata)
if err != nil {
logger.Logger.WithError(err).Error("Failed to serialize metadata")
return nil, err
}
if len(metadataBytes) > constants.INVOICE_METADATA_MAX_LENGTH {
return nil, fmt.Errorf("encoded invoice metadata provided is too large. Limit: %d Received: %d", constants.INVOICE_METADATA_MAX_LENGTH, len(metadataBytes))
}
}
if combinedMetadata["app_id"] != nil {
overwriteAppIdType, ok := combinedMetadata["app_id"].(float64)
if metadata["app_id"] != nil {
overwriteAppIdType, ok := metadata["app_id"].(float64)
if !ok {
return nil, errors.New("failed to overwrite app ID")
}
@ -172,24 +180,6 @@ func (svc *transactionsService) MakeInvoice(ctx context.Context, amountMsat uint
logger.Logger.WithError(err).Error("Failed to create transaction")
return nil, err
}
for key, value := range lnClientTransaction.Metadata {
if _, exists := combinedMetadata[key]; exists {
continue
}
combinedMetadata[key] = value
}
var metadataBytes []byte
if len(combinedMetadata) > 0 {
metadataBytes, err = json.Marshal(combinedMetadata)
if err != nil {
logger.Logger.WithError(err).Error("Failed to serialize metadata")
return nil, err
}
if len(metadataBytes) > constants.INVOICE_METADATA_MAX_LENGTH {
return nil, fmt.Errorf("encoded invoice metadata provided is too large. Limit: %d Received: %d", constants.INVOICE_METADATA_MAX_LENGTH, len(metadataBytes))
}
}
var preimage *string
if lnClientTransaction.Preimage != "" {
@ -809,33 +799,6 @@ func (svc *transactionsService) ConsumeEvent(ctx context.Context, event *events.
}
}
if lnClientTransaction.Metadata != nil {
mergedMetadata := map[string]interface{}{}
if dbTransaction.Metadata != nil {
if err := json.Unmarshal(dbTransaction.Metadata, &mergedMetadata); err != nil {
logger.Logger.WithError(err).WithField("payment_hash", lnClientTransaction.PaymentHash).Warn("Failed to deserialize existing transaction metadata; overwriting with latest lnclient metadata")
mergedMetadata = map[string]interface{}{}
}
}
for key, value := range lnClientTransaction.Metadata {
mergedMetadata[key] = value
}
metadataBytes, err := json.Marshal(mergedMetadata)
if err != nil {
logger.Logger.WithError(err).WithField("payment_hash", lnClientTransaction.PaymentHash).Error("Failed to serialize merged transaction metadata")
return err
}
if len(metadataBytes) > constants.INVOICE_METADATA_MAX_LENGTH {
return fmt.Errorf("encoded invoice metadata provided is too large. Limit: %d Received: %d", constants.INVOICE_METADATA_MAX_LENGTH, len(metadataBytes))
}
dbTransaction.Metadata = datatypes.JSON(metadataBytes)
err = tx.Model(&dbTransaction).Update("metadata", dbTransaction.Metadata).Error
if err != nil {
logger.Logger.WithError(err).WithField("payment_hash", lnClientTransaction.PaymentHash).Error("Failed to update transaction metadata")
return err
}
}
_, err := svc.markTransactionSettled(tx, &dbTransaction, lnClientTransaction.Preimage, uint64(lnClientTransaction.FeesPaidMsat), false)
return err
})