Krutoy kostil

apps/timers/cmd/main.go

@@ -6,6 +6,7 @@ import (
 	"github.com/satont/twir/apps/timers/internal/activity"
 	"github.com/satont/twir/apps/timers/internal/gorm"
 	"github.com/satont/twir/apps/timers/internal/grpc_server"
+	"github.com/satont/twir/apps/timers/internal/redis"
 	"github.com/satont/twir/apps/timers/internal/repositories/channels"
 	"github.com/satont/twir/apps/timers/internal/repositories/streams"
 	"github.com/satont/twir/apps/timers/internal/repositories/timers"
@@ -27,6 +28,7 @@ func main() {
 			sentryInternal.NewFx(sentryInternal.NewFxOpts{Service: "timers"}),
 			logger.NewFx(logger.Opts{Level: slog.LevelInfo, Service: "timers"}),
 			gorm.New,
+			redis.New,
 			timers.NewGorm,
 			activity.New,
 			workflow.New,

apps/timers/internal/activity/activity.go

@@ -3,7 +3,9 @@ package activity
 import (
 	"context"
 	"errors"
+	"time"
 
+	"github.com/redis/go-redis/v9"
 	"github.com/satont/twir/apps/timers/internal/repositories/channels"
 	"github.com/satont/twir/apps/timers/internal/repositories/streams"
 	"github.com/satont/twir/apps/timers/internal/repositories/timers"
@@ -22,6 +24,7 @@ type Opts struct {
 	Cfg                config.Config
 	ParserGrpc         parser.ParserClient
 	BotsGrpc           bots.BotsClient
+	Redis              *redis.Client
 }
 
 func New(opts Opts) *Activity {
@@ -32,6 +35,7 @@ func New(opts Opts) *Activity {
 		cfg:                opts.Cfg,
 		parserGrpc:         opts.ParserGrpc,
 		botsGrpc:           opts.BotsGrpc,
+		redis:              opts.Redis,
 	}
 }
 
@@ -42,28 +46,34 @@ type Activity struct {
 	cfg                config.Config
 	parserGrpc         parser.ParserClient
 	botsGrpc           bots.BotsClient
+	redis              *redis.Client
 }
 
-func (c *Activity) SendMessage(ctx context.Context, timerId string, currentResponse int) (
+func (c *Activity) SendMessage(ctx context.Context, timerId string, _ int) (
 	int,
 	error,
 ) {
 	timer, err := c.timersRepository.GetById(timerId)
 	if err != nil {
-		return currentResponse, err
+		return 0, err
 	}
 
 	channel, err := c.channelsRepository.GetById(timer.ChannelID)
 	if err != nil {
-		return currentResponse, err
+		return 0, err
 	}
 
 	if !channel.Enabled {
-		return currentResponse, nil
+		return 0, nil
 	}
 
 	if !channel.IsBotMod {
-		return currentResponse, nil
+		return 0, nil
+	}
+
+	currentResponse, err := c.redis.Get(ctx, "timers:current_response:"+timerId).Int()
+	if err != nil && !errors.Is(err, redis.Nil) {
+		return currentResponse, err
 	}
 
 	stream, err := c.streamsRepository.GetByChannelId(channel.ID)
@@ -101,6 +111,11 @@ func (c *Activity) SendMessage(ctx context.Context, timerId string, currentRespo
 		nextIndex = 0
 	}
 
+	err = c.redis.Set(ctx, "timers:current_response:"+timerId, nextIndex, 24*time.Hour).Err()
+	if err != nil {
+		return nextIndex, err
+	}
+
 	return nextIndex, nil
 }
 

apps/timers/internal/redis/redis.go

@@ -0,0 +1,15 @@
+package redis
+
+import (
+	"github.com/redis/go-redis/v9"
+	cfg "github.com/satont/twir/libs/config"
+)
+
+func New(config cfg.Config) (*redis.Client, error) {
+	redisOpts, err := redis.ParseURL(config.RedisUrl)
+	if err != nil {
+		return nil, err
+	}
+
+	return redis.NewClient(redisOpts), nil
+}

apps/timers/internal/workflow/workflow.go

@@ -109,7 +109,5 @@ func (c *Workflow) Flow(ctx workflow.Context, timer timers.Timer) error {
 		return err
 	}
 
-	_ = workflow.Sleep(ctx, 1*time.Second)
-
 	return nil
 }