GlcoinCore/lightningtipbot
1
0
Fork 0
mirror of https://github.com/ChuckNorrison/LightningTipBot.git synced 2026-08-13 12:33:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

returns

Browse source
This commit is contained in:
callebtc 2022-08-20 01:03:22 +02:00
parent df303ae186
commit 250c036c47
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/api/lightning.go
View file

@ -7,6 +7,7 @@ import (
"github.com/LightningTipBot/LightningTipBot/internal"
"github.com/LightningTipBot/LightningTipBot/internal/lnbits"
"github.com/LightningTipBot/LightningTipBot/internal/telegram"
"github.com/gorilla/mux"
)
type Service struct {
@ -80,9 +81,10 @@ func (s Service) PayInvoice(w http.ResponseWriter, r *http.Request) {
return
}
payment, err := s.Bot.Client.Payment(*user.Wallet, invoice.PaymentHash)
payment, _ := s.Bot.Client.Payment(*user.Wallet, invoice.PaymentHash)
if err != nil {
RespondError(w, "could not get payment")
// we assume that it's paid since thre was no error earlier
payment.Paid = true
}
w.Header().Set("Content-Type", "application/json")
@ -92,9 +94,11 @@ func (s Service) PayInvoice(w http.ResponseWriter, r *http.Request) {
func (s Service) PaymentStatus(w http.ResponseWriter, r *http.Request) {
user := telegram.LoadUser(r.Context())
payment, err := s.Bot.Client.Payment(*user.Wallet, "")
payment_hash := mux.Vars(r)["payment_hash"]
payment, err := s.Bot.Client.Payment(*user.Wallet, payment_hash)
if err != nil {
RespondError(w, "could not get payment")
return
}
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
@ -104,10 +108,12 @@ func (s Service) PaymentStatus(w http.ResponseWriter, r *http.Request) {
// InvoiceStatus
func (s Service) InvoiceStatus(w http.ResponseWriter, r *http.Request) {
user := telegram.LoadUser(r.Context())
payment_hash := mux.Vars(r)["payment_hash"]
user.Wallet = &lnbits.Wallet{}
payment, err := s.Bot.Client.Payment(*user.Wallet, "")
payment, err := s.Bot.Client.Payment(*user.Wallet, payment_hash)
if err != nil {
RespondError(w, "could not get payment")
RespondError(w, "could not get invoice")
return
}
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)

2
internal/lnbits/lnbits.go
View file

@ -157,7 +157,7 @@ func (c Client) Payments(w Wallet) (wtx Payments, err error) {
}
// Payment state of a payment
func (c Client) Payment(w Wallet, payment_hash string) (payment Payment, err error) {
func (c Client) Payment(w Wallet, payment_hash string) (payment LNbitsPayment, err error) {
// custom header with invoice key
invoiceHeader := req.Header{
"Content-Type": "application/json",

6
internal/lnbits/types.go
View file

@ -134,6 +134,12 @@ type Payment struct {
WebhookStatus interface{} `json:"webhook_status"`
}
type LNbitsPayment struct {
Paid bool `json:"paid"`
Preimage string `json:"preimage"`
Details Payment `json:"details,omitempty"`
}
type Payments []Payment
type Invoice struct {