Merge pull request #57 from teknologi-umum/refactor/telebot-dependency

refactor: make telebot dependency to support context

.github/CODEOWNERS

@@ -1 +1,2 @@
-* @aldy505 @elianiva
+* @teknologi-umum/backend-go
+.github @teknologi-umum/infrastructure

.github/workflows/deploy.yml

@@ -11,6 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
+      - name: Setup jq
+        uses: dcarbone/[email protected]
+
       - name: Checkout code
         uses: actions/checkout@v4
         with:

.github/workflows/pr.yml

@@ -11,6 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
+      - name: Setup jq
+        uses: dcarbone/[email protected]
+
       - name: Checkout code
         uses: actions/checkout@v4
         with:

analytics/analytics.go

@@ -3,7 +3,7 @@ package analytics
 import (
 	"github.com/allegro/bigcache/v3"
 	"github.com/jmoiron/sqlx"
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // Dependency is the dependency injection struct

analytics/join.go

@@ -11,7 +11,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // NewUser adds a newly joined user on the group into the database.

analytics/join_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/getsentry/sentry-go"
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 func TestNewUser(t *testing.T) {

analytics/msg.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // NewMessage handles an incoming message from the group

analytics/msg_test.go

@@ -3,7 +3,7 @@ package analytics_test
 import (
 	"testing"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 func TestNewMsg(t *testing.T) {

analytics/parser.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/teknologi-umum/captcha/utils"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 type NullInt64 sql.NullInt64

analytics/parser_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/teknologi-umum/captcha/analytics"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 func TestParseGroupMember(t *testing.T) {

analytics/swarm.go

@@ -9,7 +9,7 @@ import (
 	"github.com/teknologi-umum/captcha/shared"
 	"github.com/teknologi-umum/captcha/utils"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 func (d *Dependency) SwarmLog(user *tb.User, groupID int64, finishedCaptcha bool) {
@@ -125,7 +125,7 @@ func (d *Dependency) UpdateSwarm(user *tb.User, groupID int64, finishedCaptcha b
 }
 
 func (d *Dependency) PurgeBots(ctx context.Context, m *tb.Message) {
-	admins, err := d.Bot.AdminsOf(m.Chat)
+	admins, err := d.Bot.AdminsOf(ctx, m.Chat)
 	if err != nil {
 		shared.HandleError(ctx, fmt.Errorf("get admins: %w", err))
 		return
@@ -186,7 +186,7 @@ func (d *Dependency) PurgeBots(ctx context.Context, m *tb.Message) {
 			return
 		}
 
-		err = d.Bot.Ban(m.Chat, &tb.ChatMember{
+		err = d.Bot.Ban(ctx, m.Chat, &tb.ChatMember{
 			RestrictedUntil: tb.Forever(),
 			User: &tb.User{
 				ID: userID,
@@ -237,7 +237,7 @@ func (d *Dependency) PurgeBots(ctx context.Context, m *tb.Message) {
 		return
 	}
 
-	_, err = d.Bot.Send(m.Chat, fmt.Sprintf("%d bots have been banned", len(userIDs)))
+	_, err = d.Bot.Send(ctx, m.Chat, fmt.Sprintf("%d bots have been banned", len(userIDs)))
 	if err != nil {
 		shared.HandleError(ctx, fmt.Errorf("send: %w", err))
 		return

ascii/ascii.go

@@ -7,7 +7,7 @@ import (
 	"github.com/teknologi-umum/captcha/shared"
 	"github.com/teknologi-umum/captcha/utils"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // Dependencies contains dependency injection struct
@@ -25,13 +25,15 @@ func (d *Dependencies) Ascii(ctx context.Context, m *tb.Message) {
 	gen := utils.GenerateAscii(m.Payload)
 
 	_, err := d.Bot.Send(
+		ctx,
 		m.Chat,
 		"<pre>"+gen+"</pre>",
 		&tb.SendOptions{ParseMode: tb.ModeHTML, AllowWithoutReply: true},
 	)
 	if err != nil {
 		if errors.Is(err, tb.ErrEmptyMessage) {
 			_, err := d.Bot.Send(
+				ctx,
 				m.Chat,
 				"That text is not supported yet",
 				&tb.SendOptions{

captcha/additional.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // Collect AdditionalMsg that was sent because the user did something

captcha/answer.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/allegro/bigcache/v3"
 	"github.com/pkg/errors"
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // WaitForAnswer is the handler for listening to incoming user message.
@@ -76,6 +76,7 @@ func (d *Dependencies) WaitForAnswer(ctx context.Context, m *tb.Message) {
 	if answer != captcha.Answer {
 		remainingTime := time.Until(captcha.Expiry)
 		wrongMsg, err := d.Bot.Send(
+			ctx,
 			m.Chat,
 			"Jawaban captcha salah, harap coba lagi. Kamu punya "+
 				strconv.Itoa(int(remainingTime.Seconds()))+
@@ -84,15 +85,10 @@ func (d *Dependencies) WaitForAnswer(ctx context.Context, m *tb.Message) {
 				ParseMode:             tb.ModeHTML,
 				ReplyTo:               m,
 				DisableWebPagePreview: true,
+				AllowWithoutReply:     true,
 			},
 		)
 		if err != nil {
-			if strings.Contains(err.Error(), "replied message not found") {
-				// Don't retry to send the message if the user won't know
-				// which message we're replying to.
-				return
-			}
-
 			if strings.Contains(err.Error(), "retry after") {
 				// If this happens, probably we're in a spam bot surge and would
 				// probably don't care with the user captcha after all.
@@ -153,7 +149,7 @@ func (d *Dependencies) WaitForAnswer(ctx context.Context, m *tb.Message) {
 		if msgID == "" {
 			continue
 		}
-		err = d.deleteMessageBlocking(&tb.StoredMessage{
+		err = d.deleteMessageBlocking(ctx, &tb.StoredMessage{
 			ChatID:    m.Chat.ID,
 			MessageID: msgID,
 		})
@@ -168,7 +164,7 @@ func (d *Dependencies) WaitForAnswer(ctx context.Context, m *tb.Message) {
 		if msgID == "" {
 			continue
 		}
-		err = d.deleteMessageBlocking(&tb.StoredMessage{
+		err = d.deleteMessageBlocking(ctx, &tb.StoredMessage{
 			ChatID:    m.Chat.ID,
 			MessageID: msgID,
 		})
@@ -179,7 +175,7 @@ func (d *Dependencies) WaitForAnswer(ctx context.Context, m *tb.Message) {
 	}
 
 	// Delete the question message.
-	err = d.deleteMessageBlocking(&tb.StoredMessage{
+	err = d.deleteMessageBlocking(ctx, &tb.StoredMessage{
 		ChatID:    m.Chat.ID,
 		MessageID: captcha.QuestionID,
 	})

captcha/captcha.go

@@ -2,7 +2,7 @@ package captcha
 
 import (
 	"github.com/allegro/bigcache/v3"
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // Dependencies contains the dependency injection struct for

captcha/delete.go

@@ -2,33 +2,30 @@ package captcha
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/teknologi-umum/captcha/shared"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // deleteMessage creates a timer of one minute to delete a certain message.
 func (d *Dependencies) deleteMessage(ctx context.Context, message *tb.StoredMessage) {
 	c := make(chan struct{}, 1)
 	time.AfterFunc(time.Minute*1, func() {
 		for {
-			err := d.Bot.Delete(message)
+			err := d.Bot.Delete(ctx, message)
 			if err != nil && !strings.Contains(err.Error(), "message to delete not found") {
-				if strings.Contains(err.Error(), "retry after") {
-					// Acquire the retry number
-					retry, err := strconv.Atoi(strings.Split(strings.Split(err.Error(), "telegram: retry after ")[1], " ")[0])
-					if err != nil {
-						// If there's an error, we'll just retry after 15 second
-						retry = 15
+				var floodError tb.FloodError
+				if errors.As(err, &floodError) {
+					if floodError.RetryAfter == 0 {
+						floodError.RetryAfter = 15
 					}
 
-					// Let's wait a bit and retry
-					time.Sleep(time.Second * time.Duration(retry))
+					time.Sleep(time.Second * time.Duration(floodError.RetryAfter))
 					continue
 				}
 
@@ -49,20 +46,17 @@ func (d *Dependencies) deleteMessage(ctx context.Context, message *tb.StoredMess
 	<-c
 }
 
-func (d *Dependencies) deleteMessageBlocking(message *tb.StoredMessage) error {
+func (d *Dependencies) deleteMessageBlocking(ctx context.Context, message *tb.StoredMessage) error {
 	for {
-		err := d.Bot.Delete(message)
+		err := d.Bot.Delete(ctx, message)
 		if err != nil && !strings.Contains(err.Error(), "message to delete not found") {
-			if strings.Contains(err.Error(), "retry after") {
-				// Acquire the retry number
-				retry, err := strconv.Atoi(strings.Split(strings.Split(err.Error(), "telegram: retry after ")[1], " ")[0])
-				if err != nil {
-					// If there's an error, we'll just retry after 15 second
-					retry = 15
+			var floodError tb.FloodError
+			if errors.As(err, &floodError) {
+				if floodError.RetryAfter == 0 {
+					floodError.RetryAfter = 15
 				}
 
-				// Let's wait a bit and retry
-				time.Sleep(time.Second * time.Duration(retry))
+				time.Sleep(time.Second * time.Duration(floodError.RetryAfter))
 				continue
 			}
 

captcha/join.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/allegro/bigcache/v3"
 
-	tb "gopkg.in/telebot.v3"
+	tb "github.com/teknologi-umum/captcha/internal/telebot"
 )
 
 // Captcha struct keeps all the data needed for the captcha
@@ -72,7 +72,7 @@ func (d *Dependencies) CaptchaUserJoin(ctx context.Context, m *tb.Message) {
 	if err != nil {
 		if errors.Is(err, bigcache.ErrEntryNotFound) {
 			// Find and set
-			admins, err = d.Bot.AdminsOf(m.Chat)
+			admins, err = d.Bot.AdminsOf(ctx, m.Chat)
 			if err != nil {
 				if !strings.Contains(err.Error(), "Gateway Timeout (504)") && !strings.Contains(err.Error(), "retry after") {
 					shared.HandleBotError(ctx, err, d.Bot, m)
@@ -138,25 +138,24 @@ func (d *Dependencies) CaptchaUserJoin(ctx context.Context, m *tb.Message) {
 SENDMSG_RETRY:
 	// Send the question first.
 	msgQuestion, err := d.Bot.Send(
+		ctx,
 		m.Chat,
 		question,
 		&tb.SendOptions{
 			ParseMode:             tb.ModeHTML,
 			ReplyTo:               m,
 			DisableWebPagePreview: true,
+			AllowWithoutReply:     true,
 		},
 	)
 	if err != nil {
-		if strings.Contains(err.Error(), "retry after") {
-			// Acquire the retry number
-			retry, err := strconv.Atoi(strings.Split(strings.Split(err.Error(), "telegram: retry after ")[1], " ")[0])
-			if err != nil {
-				// If there's an error, we'll just retry after 10 second
-				retry = 10
+		var floodError tb.FloodError
+		if errors.As(err, &floodError) {
+			if floodError.RetryAfter == 0 {
+				floodError.RetryAfter = 15
 			}
 
-			// Let's wait a bit and retry
-			time.Sleep(time.Second * time.Duration(retry))
+			time.Sleep(time.Second * time.Duration(floodError.RetryAfter))
 			goto SENDMSG_RETRY
 		}
 
@@ -165,23 +164,6 @@ SENDMSG_RETRY:
 			goto SENDMSG_RETRY
 		}
 
-		if strings.Contains(err.Error(), "replied message not found") {
-			msgQuestion, err = d.Bot.Send(
-				m.Chat,
-				question,
-				&tb.SendOptions{
-					ParseMode:             tb.ModeHTML,
-					DisableWebPagePreview: true,
-				},
-			)
-			if err != nil {
-				if !strings.Contains(err.Error(), "retry after") && !strings.Contains(err.Error(), "Gateway Timeout (504)") {
-					shared.HandleBotError(ctx, err, d.Bot, m)
-					return
-				}
-			}
-		}
-
 		// err could possibly be nil at this point, so we better check it out.
 		if err != nil {
 			shared.HandleBotError(ctx, err, d.Bot, m)