fix(captcha): welcome message should omit cancel signal (#77)

Author: aldy505

captcha/answer.go

@@ -138,7 +138,7 @@ func (d *Dependencies) WaitForAnswer(ctx context.Context, m *tb.Message) {
 		return
 	}
 
-	err = d.removeUserFromCache(m.Sender.ID, m.Chat.ID)
+	err = d.removeUserFromCache(ctx, m.Sender.ID, m.Chat.ID)
 	if err != nil {
 		shared.HandleBotError(ctx, err, d.Bot, m)
 		return
@@ -201,7 +201,10 @@ func (d *Dependencies) WaitForAnswer(ctx context.Context, m *tb.Message) {
 }
 
 // It... remove the user from cache. What else do you expect?
-func (d *Dependencies) removeUserFromCache(userID int64, groupID int64) error {
+func (d *Dependencies) removeUserFromCache(ctx context.Context, userID int64, groupID int64) error {
+	span := sentry.StartSpan(ctx, "captcha.remove_user_from_cache")
+	defer span.Finish()
+
 	err := d.DB.Update(func(txn *badger.Txn) error {
 		item, err := txn.Get([]byte("captcha:users:" + strconv.FormatInt(groupID, 10)))
 		if err != nil {

captcha/cleanup.go

@@ -63,7 +63,7 @@ func (d *Dependencies) Cleanup() {
 					sentry.CaptureException(err)
 				}
 
-				err = d.removeUserFromCache(captcha.SenderID, captcha.ChatID)
+				err = d.removeUserFromCache(context.Background(), captcha.SenderID, captcha.ChatID)
 				if err != nil && !errors.Is(err, badger.ErrKeyNotFound) {
 					sentry.CaptureException(err)
 				}

captcha/leave.go

@@ -80,7 +80,7 @@ func (d *Dependencies) CaptchaUserLeave(ctx context.Context, m *tb.Message) {
 		return
 	}
 
-	err = d.removeUserFromCache(m.Sender.ID, m.Chat.ID)
+	err = d.removeUserFromCache(ctx, m.Sender.ID, m.Chat.ID)
 	if err != nil {
 		shared.HandleBotError(ctx, err, d.Bot, m)
 		return

captcha/welcome.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"strconv"
 	"strings"
 	"time"
@@ -67,6 +67,7 @@ var regularWelcomeMessage = "Halo, {user}!\n\n" +
 // sendWelcomeMessage literally does what it's written.
 func (d *Dependencies) sendWelcomeMessage(ctx context.Context, m *tb.Message) error {
 	span := sentry.StartSpan(ctx, "captcha.send_welcome_message")
+	ctx = context.WithoutCancel(span.Context())
 	defer span.Finish()
 
 	var msgToSend string = regularWelcomeMessage
@@ -117,13 +118,12 @@ func (d *Dependencies) sendWelcomeMessage(ctx context.Context, m *tb.Message) er
 			ctx,
 			[]tb.Editable{&tb.StoredMessage{MessageID: strconv.Itoa(msg.ID), ChatID: m.Chat.ID}},
 		)
-
 		break
 	}
 
 	return nil
 }
 
 func randomNum() int {
-	return rand.Intn(len(currentWelcomeMessages))
+	return rand.IntN(len(currentWelcomeMessages))
 }

utils/random.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"math/rand"
+	"math/rand/v2"
 	"strconv"
 	"strings"
 )
@@ -10,7 +10,7 @@ import (
 func GenerateRandomNumber() string {
 	var out strings.Builder
 	for i := 0; i < 3; i++ {
-		randomNumber := rand.Intn(14)
+		randomNumber := rand.IntN(14)
 		if randomNumber == 10 {
 			out.WriteString("V")
 		} else if randomNumber == 11 {