From bc8c8f952ad6d149fc43ed4902c4357e64951309 Mon Sep 17 00:00:00 2001 From: gohumble <55599638+gohumble@users.noreply.github.com> Date: Thu, 20 Oct 2022 09:36:59 +0200 Subject: [PATCH] trim whitespaces in send handler (#424) --- internal/telegram/send.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/telegram/send.go b/internal/telegram/send.go index 3f34394..976fa18 100644 --- a/internal/telegram/send.go +++ b/internal/telegram/send.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "regexp" "strings" "github.com/LightningTipBot/LightningTipBot/internal/telegram/intercept" @@ -85,13 +86,23 @@ func (bot *TipBot) sendHandler(ctx intercept.Context) (intercept.Context, error) amount, err := decodeAmountFromCommand(ctx.Text()) // info: /send 10 DEMANDS an amount, while /send also works without // todo: /send should also invoke amount input dialog if no amount is given - + if err != nil { + return ctx, err + } // CHECK whether first or second argument is a LIGHTNING ADDRESS arg := "" + space := regexp.MustCompile(`\s+`) + ctx.Message().Text = space.ReplaceAllString(ctx.Message().Text, " ") if len(strings.Split(ctx.Message().Text, " ")) > 2 { arg, err = getArgumentFromCommand(ctx.Message().Text, 2) + if err != nil { + return ctx, err + } } else if len(strings.Split(ctx.Message().Text, " ")) == 2 { arg, err = getArgumentFromCommand(ctx.Message().Text, 1) + if err != nil { + return ctx, err + } } if err == nil { if lightning.IsLightningAddress(arg) {