diff --git a/api/models.go b/api/models.go
index b3ae8ca0..fc1aa8af 100644
--- a/api/models.go
+++ b/api/models.go
@@ -200,15 +200,35 @@ type Transaction struct {
Type string `json:"type"`
Invoice string `json:"invoice"`
Description string `json:"description"`
- DescriptionHash string `json:"description_hash"`
+ DescriptionHash string `json:"descriptionHash"`
Preimage *string `json:"preimage"`
- PaymentHash string `json:"payment_hash"`
+ PaymentHash string `json:"paymentHash"`
Amount uint64 `json:"amount"`
- FeesPaid uint64 `json:"fees_paid"`
- CreatedAt string `json:"created_at"`
- SettledAt *string `json:"settled_at"`
- AppId *uint `json:"app_id"`
- Metadata interface{} `json:"metadata,omitempty"`
+ FeesPaid uint64 `json:"feesPaid"`
+ CreatedAt string `json:"createdAt"`
+ SettledAt *string `json:"settledAt"`
+ AppId *uint `json:"appId"`
+ Metadata Metadata `json:"metadata,omitempty"`
+ Boostagram *Boostagram `json:"boostagram,omitempty"`
+}
+
+type Metadata = map[string]interface{}
+
+type Boostagram struct {
+ AppName string `json:"appName"`
+ Name string `json:"name"`
+ Podcast string `json:"podcast"`
+ URL string `json:"url"`
+ Episode string `json:"episode,omitempty"`
+ FeedId string `json:"feedId,omitempty"`
+ ItemId string `json:"itemId,omitempty"`
+ Timestamp int64 `json:"ts,omitempty"`
+ Message string `json:"message,omitempty"`
+ SenderId string `json:"senderId"`
+ SenderName string `json:"senderName"`
+ Time string `json:"time"`
+ Action string `json:"action"`
+ ValueMsatTotal int64 `json:"valueMsatTotal"`
}
// debug api
diff --git a/api/transactions.go b/api/transactions.go
index 8582c36a..49900f1f 100644
--- a/api/transactions.go
+++ b/api/transactions.go
@@ -73,17 +73,30 @@ func toApiTransaction(transaction *transactions.Transaction) *Transaction {
preimage = transaction.Preimage
}
- var metadata interface{}
- if transaction.Metadata != "" {
- jsonErr := json.Unmarshal([]byte(transaction.Metadata), &metadata)
+ var metadata Metadata
+ if transaction.Metadata != nil {
+ jsonErr := json.Unmarshal(transaction.Metadata, &metadata)
if jsonErr != nil {
logger.Logger.WithError(jsonErr).WithFields(logrus.Fields{
- "id": transaction.ID,
- "metadata": transaction.Metadata,
+ "payment_hash": transaction.PaymentHash,
+ "metadata": transaction.Metadata,
}).Error("Failed to deserialize transaction metadata")
}
}
+ var boostagram *Boostagram
+ if transaction.Boostagram != nil {
+ var txBoostagram transactions.Boostagram
+ jsonErr := json.Unmarshal(transaction.Boostagram, &txBoostagram)
+ if jsonErr != nil {
+ logger.Logger.WithError(jsonErr).WithFields(logrus.Fields{
+ "payment_hash": transaction.PaymentHash,
+ "boostagram": transaction.Boostagram,
+ }).Error("Failed to deserialize transaction boostagram info")
+ }
+ boostagram = toApiBoostagram(&txBoostagram)
+ }
+
return &Transaction{
Type: transaction.Type,
Invoice: transaction.PaymentRequest,
@@ -97,5 +110,25 @@ func toApiTransaction(transaction *transactions.Transaction) *Transaction {
CreatedAt: createdAt,
SettledAt: settledAt,
Metadata: metadata,
+ Boostagram: boostagram,
+ }
+}
+
+func toApiBoostagram(boostagram *transactions.Boostagram) *Boostagram {
+ return &Boostagram{
+ AppName: boostagram.AppName,
+ Name: boostagram.Name,
+ Podcast: boostagram.Podcast,
+ URL: boostagram.URL,
+ Episode: boostagram.Episode,
+ FeedId: boostagram.FeedId,
+ ItemId: boostagram.ItemId,
+ Timestamp: boostagram.Timestamp,
+ Message: boostagram.Message,
+ SenderId: boostagram.SenderId,
+ SenderName: boostagram.SenderName,
+ Time: boostagram.Time,
+ Action: boostagram.Action,
+ ValueMsatTotal: boostagram.ValueMsatTotal,
}
}
diff --git a/db/migrations/202408061737_add_boostagrams_and_use_json.go b/db/migrations/202408061737_add_boostagrams_and_use_json.go
new file mode 100644
index 00000000..ab7f48c7
--- /dev/null
+++ b/db/migrations/202408061737_add_boostagrams_and_use_json.go
@@ -0,0 +1,29 @@
+package migrations
+
+import (
+ _ "embed"
+
+ "github.com/go-gormigrate/gormigrate/v2"
+ "gorm.io/gorm"
+)
+
+// This migration adds boostagram column to transactions
+var _202408061737_add_boostagrams_and_use_json = &gormigrate.Migration{
+ ID: "202408061737_add_boostagrams_and_use_json",
+ Migrate: func(db *gorm.DB) error {
+ err := db.Transaction(func(tx *gorm.DB) error {
+ return tx.Exec(`
+ ALTER TABLE transactions ADD COLUMN boostagram JSON;
+ ALTER TABLE transactions ADD COLUMN metadata_temp JSON;
+ UPDATE transactions SET metadata_temp = json(metadata) where metadata != "";
+ ALTER TABLE transactions DROP COLUMN metadata;
+ ALTER TABLE transactions RENAME COLUMN metadata_temp TO metadata;
+ `).Error
+ })
+
+ return err
+ },
+ Rollback: func(tx *gorm.DB) error {
+ return nil
+ },
+}
diff --git a/db/migrations/migrate.go b/db/migrations/migrate.go
index 104ddf24..7ef37acf 100644
--- a/db/migrations/migrate.go
+++ b/db/migrations/migrate.go
@@ -19,6 +19,7 @@ func Migrate(gormDB *gorm.DB) error {
_202407151352_autoincrement,
_202407201604_transactions_indexes,
_202407262257_remove_invalid_scopes,
+ _202408061737_add_boostagrams_and_use_json,
})
return m.Migrate()
diff --git a/db/models.go b/db/models.go
index f3419b8a..2ea1cf40 100644
--- a/db/models.go
+++ b/db/models.go
@@ -1,6 +1,10 @@
package db
-import "time"
+import (
+ "time"
+
+ "gorm.io/datatypes"
+)
type UserConfig struct {
ID uint
@@ -75,8 +79,9 @@ type Transaction struct {
ExpiresAt *time.Time
UpdatedAt time.Time
SettledAt *time.Time
- Metadata string
+ Metadata datatypes.JSON
SelfPayment bool
+ Boostagram datatypes.JSON
}
type DBService interface {
diff --git a/frontend/src/components/PodcastingInfo.tsx b/frontend/src/components/PodcastingInfo.tsx
new file mode 100644
index 00000000..7f207c9a
--- /dev/null
+++ b/frontend/src/components/PodcastingInfo.tsx
@@ -0,0 +1,63 @@
+import { Boostagram } from "src/types";
+
+function PodcastingInfo({ boost }: { boost: Boostagram }) {
+ return (
+ <>
+ {boost.message && (
+
+
Message
+
{boost.message}
+
+
Podcast
+
{boost.podcast}
+
+
Episode
+
{boost.episode}
+
+
Action
+
{boost.action}
+
+
Timestamp
+
{boost.ts}
+
+
Total amount
+
+ {new Intl.NumberFormat(undefined, {}).format(
+ Math.floor(boost.valueMsatTotal / 1000)
+ )}{" "}
+ {Math.floor(boost.valueMsatTotal / 1000) == 1 ? "sat" : "sats"}
+
+
+
Sender
+
{boost.senderName}
+
+
App
+
{boost.appName}
+
- {dayjs(tx.settled_at).fromNow()}
+ {dayjs(tx.settledAt).fromNow()}
@@ -166,7 +167,7 @@ function TransactionItem({ tx }: Props) {
Date & Time
- {dayjs(tx.settled_at)
+ {dayjs(tx.settledAt)
.tz(dayjs.tz.guess())
.format("D MMMM YYYY, HH:mm")}
@@ -176,9 +177,9 @@ function TransactionItem({ tx }: Props) {
Fee
{new Intl.NumberFormat(undefined, {}).format(
- Math.floor(tx.fees_paid / 1000)
+ Math.floor(tx.feesPaid / 1000)
)}{" "}
- {Math.floor(tx.fees_paid / 1000) == 1 ? "sat" : "sats"}
+ {Math.floor(tx.feesPaid / 1000) == 1 ? "sat" : "sats"}
)}
@@ -191,52 +192,55 @@ function TransactionItem({ tx }: Props) {
)}
-
- setShowDetails(!showDetails)}
- >
- Details
- {showDetails ? (
-
- ) : (
-
- )}
-
- {showDetails && (
- <>
-
-
Preimage
-
-
- {tx.preimage}
-
-
{
- if (tx.preimage) {
- copy(tx.preimage);
- }
- }}
- />
+
+
+
setShowDetails(!showDetails)}
+ >
+ Details
+ {showDetails ? (
+
+ ) : (
+
+ )}
+
+ {showDetails && (
+ <>
+ {tx.boostagram &&
}
+
+
Preimage
+
+
+ {tx.preimage}
+
+
{
+ if (tx.preimage) {
+ copy(tx.preimage);
+ }
+ }}
+ />
+
-
-
Hash
-
-
- {tx.payment_hash}
-
-
{
- copy(tx.payment_hash);
- }}
- />
+
+
Hash
+
+
+ {tx.paymentHash}
+
+
{
+ copy(tx.paymentHash);
+ }}
+ />
+
-
- )}
+
+ )}
+