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

better (#160)

Browse source 
Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com>
This commit is contained in:
LightningTipBot 2021-12-11 22:09:52 +01:00 • committed by GitHub
parent f50e6ced71
commit 1ea9268698
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/telegram/inline_faucet.go
View file

@ -184,7 +184,7 @@ func (bot TipBot) faucetHandler(ctx context.Context, m *tb.Message) {
ctx = bot.mapFaucetLanguage(ctx, m.Text)
inlineFaucet, err := bot.makeFaucet(ctx, m, false)
if err != nil {
log.Errorf("[faucet] %s", err)
log.Warnf("[faucet] %s", err.Error())
return
}
fromUserStr := GetUserStr(m.Sender)
@ -273,7 +273,6 @@ func (bot *TipBot) acceptInlineFaucetHandler(ctx context.Context, c *tb.Callback
// check if user exists and create a wallet if not
_, exists := bot.UserExists(to.Telegram)
if !exists {
log.Infof("[faucet] User %s has no wallet.", toUserStr)
to, err = bot.CreateWalletForTelegramUser(to.Telegram)
if err != nil {
errmsg := fmt.Errorf("[faucet] Error: Could not create wallet for %s", toUserStr)
@ -295,7 +294,7 @@ func (bot *TipBot) acceptInlineFaucetHandler(ctx context.Context, c *tb.Callback
if !success {
bot.trySendMessage(from.Telegram, Translate(ctx, "sendErrorMessage"))
errMsg := fmt.Sprintf("[faucet] Transaction failed: %s", err)
log.Errorln(errMsg)
log.Warnln(errMsg)
return
}

4
internal/telegram/pay.go
View file

@ -200,6 +200,8 @@ func (bot *TipBot) confirmPayHandler(ctx context.Context, c *tb.Callback) {
},
},
)
log.Infof("[/pay] Attempting %s's invoice %s (%d sat)", userStr, payData.ID, payData.Amount)
// pay invoice
invoice, err := user.Wallet.Pay(lnbits.PaymentParams{Out: true, Bolt11: invoiceString}, bot.Client)
if err != nil {
@ -225,7 +227,7 @@ func (bot *TipBot) confirmPayHandler(ctx context.Context, c *tb.Callback) {
bot.trySendMessage(c.Sender, i18n.Translate(payData.LanguageCode, "invoicePaidMessage"))
bot.tryEditMessage(c.Message, fmt.Sprintf(i18n.Translate(payData.LanguageCode, "invoicePublicPaidMessage"), userStr), &tb.ReplyMarkup{})
}
log.Printf("[⚡️ pay] User %s paid invoice %s (%d sat)", userStr, payData.ID, payData.Amount)
log.Infof("[⚡️ pay] User %s paid invoice %s (%d sat)", userStr, payData.ID, payData.Amount)
return
}

5
internal/telegram/send.go
View file

@ -159,6 +159,11 @@ func (bot *TipBot) sendHandler(ctx context.Context, m *tb.Message) {
return
}
if user.ID == toUserDb.ID {
bot.trySendMessage(m.Sender, Translate(ctx, "sendYourselfMessage"))
return
}
// entire text of the inline object
confirmText := fmt.Sprintf(Translate(ctx, "confirmSendMessage"), str.MarkdownEscape(toUserStrMention), amount)
if len(sendMemo) > 0 {