Use custom limiter

telegram/telegram.go

@@ -2,7 +2,6 @@ package telegram
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -11,8 +10,8 @@ import (
 	"net/url"
 	"time"
 
+	"go.balki.me/tss/limiter"
 	"go.balki.me/tss/log"
-	"golang.org/x/time/rate"
 )
 
 type TelegramSender interface {
@@ -22,8 +21,8 @@ type TelegramSender interface {
 type telegramSender struct {
 	client            *http.Client
 	authToken         string
-	rateLimiterPerMin *rate.Limiter
-	rateLimiterPerSec *rate.Limiter
+	rateLimiterPerMin limiter.Limiter
+	rateLimiterPerSec limiter.Limiter
 }
 
 func (ts *telegramSender) SendLink(link, channel, rhash, title string) error {
@@ -47,15 +46,8 @@ func (ts *telegramSender) SendLink(link, channel, rhash, title string) error {
 
 	apiUrl := fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage", ts.authToken)
 
-	err = ts.rateLimiterPerMin.Wait(context.TODO())
-	if err != nil {
-		return err
-	}
-
-	err = ts.rateLimiterPerSec.Wait(context.TODO())
-	if err != nil {
-		return err
-	}
+	ts.rateLimiterPerMin.Wait()
+	ts.rateLimiterPerSec.Wait()
 
 	res, err := ts.client.Post(apiUrl, "application/json", bytes.NewReader(data))
 	if err != nil {
@@ -79,9 +71,9 @@ func NewTelegramSender(transport http.RoundTripper, authToken string) TelegramSe
 		client:    &http.Client{Transport: transport},
 		authToken: authToken,
 		// 20 requests per min with some buffer
-		rateLimiterPerMin: rate.NewLimiter(rate.Every(65*time.Second), 20),
+		rateLimiterPerMin: limiter.NewLimiter(65*time.Second, 20),
 		// 1 msg per sec with some buffer
-		rateLimiterPerSec: rate.NewLimiter(rate.Every(1050*time.Millisecond), 1),
+		rateLimiterPerSec: limiter.NewLimiter(1050*time.Millisecond, 1),
 	}
 }