From 1ea9268698ed3b52b09102f797eccaf89ac178b2 Mon Sep 17 00:00:00 2001
From: LightningTipBot <88730856+LightningTipBot@users.noreply.github.com>
Date: Sat, 11 Dec 2021 22:09:52 +0100
Subject: [PATCH] better (#160)

Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com>
---
 internal/telegram/inline_faucet.go | 5 ++---
 internal/telegram/pay.go           | 4 +++-
 internal/telegram/send.go          | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/internal/telegram/inline_faucet.go b/internal/telegram/inline_faucet.go
index 990e7e0..fb2c429 100644
--- a/internal/telegram/inline_faucet.go
+++ b/internal/telegram/inline_faucet.go
@@ -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
 		}
 
diff --git a/internal/telegram/pay.go b/internal/telegram/pay.go
index ff275be..a46b676 100644
--- a/internal/telegram/pay.go
+++ b/internal/telegram/pay.go
@@ -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
 }
 
diff --git a/internal/telegram/send.go b/internal/telegram/send.go
index 2b8e038..ba6ec68 100644
--- a/internal/telegram/send.go
+++ b/internal/telegram/send.go
@@ -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 {