feat: update dispatcher

Author: escalopa

serverless/dispatcher/internal/handler/command.go

@@ -88,7 +88,7 @@ func (h *Handler) help(ctx context.Context, b *bot.Bot, _ *models.Update) error
 func (h *Handler) today(ctx context.Context, b *bot.Bot, _ *models.Update) error {
 	chat := getContextChat(ctx)
 
-	prayerDay, err := h.db.GetPrayerDay(ctx, chat.BotID, h.nowUTC(chat.BotID))
+	prayerDay, err := h.db.GetPrayerDay(ctx, chat.BotID, h.now(chat.BotID))
 	if err != nil {
 		log.Error("today: get prayer day", log.Err(err), log.BotID(chat.BotID), log.ChatID(chat.ChatID))
 		return domain.ErrInternal
@@ -129,7 +129,7 @@ func (h *Handler) next(ctx context.Context, b *bot.Bot, _ *models.Update) error
 
 	var (
 		now  = h.now(chat.BotID)
-		date = h.nowUTC(chat.BotID)
+		date = now.Truncate(24 * time.Hour)
 	)
 
 	prayerDay, err := h.db.GetPrayerDay(ctx, chat.BotID, date)

serverless/dispatcher/internal/handler/helper.go

@@ -53,12 +53,6 @@ func (h *Handler) now(botID int64) time.Time {
 	return time.Now().In(h.cfg[botID].Location.V()).Truncate(time.Minute)
 }
 
-// nowUTC returns the current time in UTC with seconds and nanoseconds set to 0
-// Use this function to get prayerDay or current year for a specific botID timezone.
-func (h *Handler) nowUTC(botID int64) time.Time {
-	return time.Now().In(h.cfg[botID].Location.V()).Truncate(time.Minute).UTC()
-}
-
 // daysInMonth returns the number of days in a month.
 func daysInMonth(month time.Month, year int) int {
 	// month is incremented by 1 and day is 0 because we want the last day of the month.

serverless/dispatcher/internal/handler/query.go

@@ -76,7 +76,7 @@ func (h *Handler) monthQuery(ctx context.Context, b *bot.Bot, update *models.Upd
 		ChatID:      chat.ChatID,
 		MessageID:   update.CallbackQuery.Message.Message.ID,
 		Text:        h.lp.GetText(chat.LanguageCode).PrayerDate,
-		ReplyMarkup: h.daysKeyboard(h.nowUTC(chat.BotID), month),
+		ReplyMarkup: h.daysKeyboard(h.now(chat.BotID), month),
 	})
 	if err != nil {
 		log.Error("monthQuery: edit message", log.Err(err), log.BotID(chat.BotID), log.ChatID(chat.ChatID))
@@ -98,7 +98,7 @@ func (h *Handler) dayQuery(ctx context.Context, b *bot.Bot, update *models.Updat
 	parts := strings.Split(update.CallbackQuery.Data, dataSplitterQuery)
 	month, _ := strconv.Atoi(parts[1])
 	day, _ := strconv.Atoi(parts[2])
-	date := domain.DateUTC(day, time.Month(month), h.nowUTC(chat.BotID).Year())
+	date := domain.DateUTC(day, time.Month(month), h.now(chat.BotID).Year())
 
 	prayerDay, err := h.db.GetPrayerDay(ctx, chat.BotID, date)
 	if err != nil {