feat: remove shuruq from jamaat

escalopa · escalopa · commit a36e47f87df8 · 2025-10-27T00:42:11.000+03:00
diff --git a/_scripts/migrate/main.go b/_scripts/migrate/main.go
@@ -24,7 +24,6 @@ import (
 // Domain types matching the new schema
 type JamaatDelayConfig struct {
 	Fajr    int64 `json:"fajr"`    // nanoseconds
-	Shuruq  int64 `json:"shuruq"`  // nanoseconds
 	Dhuhr   int64 `json:"dhuhr"`   // nanoseconds
 	Asr     int64 `json:"asr"`     // nanoseconds
 	Maghrib int64 `json:"maghrib"` // nanoseconds
@@ -233,7 +232,6 @@ func transformChat(oldChat OldChat, moscowLocation *time.Location) (NewChat, err
 			Enabled: subscribed && jamaat,
 			Delay: &JamaatDelayConfig{
 				Fajr:    int64(10 * time.Minute),
-				Shuruq:  int64(10 * time.Minute),
 				Dhuhr:   int64(10 * time.Minute),
 				Asr:     int64(10 * time.Minute),
 				Maghrib: int64(10 * time.Minute),
diff --git a/serverless/dispatcher/go.mod b/serverless/dispatcher/go.mod
@@ -3,7 +3,7 @@ module github.com/escalopa/prayer-bot/dispatcher
 go 1.21
 
 require (
-	github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7
+	github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad
 	github.com/go-telegram/bot v1.15.0
 	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77
 	github.com/ydb-platform/ydb-go-sdk/v3 v3.108.0
diff --git a/serverless/dispatcher/go.sum b/serverless/dispatcher/go.sum
@@ -587,6 +587,8 @@ github.com/escalopa/prayer-bot v0.0.0-20251026205320-11cb2dcd014e h1:rnAVK8yqKdv
 github.com/escalopa/prayer-bot v0.0.0-20251026205320-11cb2dcd014e/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
 github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7 h1:DO0ejIbuZJJxoxareSryEpp1HGNHRDzCkNUtKwlvhFg=
 github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
+github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad h1:bWmc3gk++my6XDOXRQKfER/xmXkl70Yobw2nQQdcroY=
+github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
diff --git a/serverless/dispatcher/internal/handler/command.go b/serverless/dispatcher/internal/handler/command.go
@@ -312,7 +312,6 @@ func (h *Handler) info(ctx context.Context, b *bot.Bot, _ *models.Update) error
 		jamaatInfo = fmt.Sprintf(text.Info.Jamaat,
 			jamaatStatus,
 			domain.FormatDuration(chat.Reminder.Jamaat.Delay.Fajr),
-			domain.FormatDuration(chat.Reminder.Jamaat.Delay.Shuruq),
 			domain.FormatDuration(chat.Reminder.Jamaat.Delay.Dhuhr),
 			domain.FormatDuration(chat.Reminder.Jamaat.Delay.Asr),
 			domain.FormatDuration(chat.Reminder.Jamaat.Delay.Maghrib),
diff --git a/serverless/dispatcher/internal/handler/handler.go b/serverless/dispatcher/internal/handler/handler.go
@@ -253,7 +253,6 @@ func (h *Handler) getChat(ctx context.Context, update *models.Update) (*domain.C
 		Jamaat: &domain.JamaatConfig{
 			Delay: &domain.JamaatDelayConfig{
 				Fajr:    10 * time.Minute,
-				Shuruq:  10 * time.Minute,
 				Dhuhr:   10 * time.Minute,
 				Asr:     10 * time.Minute,
 				Maghrib: 10 * time.Minute,
diff --git a/serverless/dispatcher/internal/handler/keyboard.go b/serverless/dispatcher/internal/handler/keyboard.go
@@ -167,7 +167,15 @@ func (h *Handler) remindEditKeyboard(reminderType domain.ReminderType, languageC
 func (h *Handler) jammatMenuKeyboard(chat *domain.Chat) *models.InlineKeyboardMarkup {
 	text := h.lp.GetText(chat.LanguageCode)
 
-	kb := &models.InlineKeyboardMarkup{InlineKeyboard: make([][]models.InlineKeyboardButton, 5)}
+	prayerIDs := []domain.PrayerID{
+		domain.PrayerIDFajr,
+		domain.PrayerIDDhuhr,
+		domain.PrayerIDAsr,
+		domain.PrayerIDMaghrib,
+		domain.PrayerIDIsha,
+	}
+
+	kb := &models.InlineKeyboardMarkup{InlineKeyboard: make([][]models.InlineKeyboardButton, len(prayerIDs)+2)}
 
 	if chat.Reminder.Jamaat.Enabled {
 		kb.InlineKeyboard[0] = []models.InlineKeyboardButton{
@@ -179,28 +187,17 @@ func (h *Handler) jammatMenuKeyboard(chat *domain.Chat) *models.InlineKeyboardMa
 		}
 	}
 
-	fajrDelay := domain.FormatDuration(chat.Reminder.Jamaat.Delay.Fajr)
-	shuruqDelay := domain.FormatDuration(chat.Reminder.Jamaat.Delay.Shuruq)
-	kb.InlineKeyboard[1] = []models.InlineKeyboardButton{
-		{Text: fmt.Sprintf("%s (%s)", text.Prayer[int(domain.PrayerIDFajr)], fajrDelay), CallbackData: "remind:jamaat:edit:fajr|"},
-		{Text: fmt.Sprintf("%s (%s)", text.Prayer[int(domain.PrayerIDShuruq)], shuruqDelay), CallbackData: "remind:jamaat:edit:shuruq|"},
-	}
-
-	dhuhrDelay := domain.FormatDuration(chat.Reminder.Jamaat.Delay.Dhuhr)
-	asrDelay := domain.FormatDuration(chat.Reminder.Jamaat.Delay.Asr)
-	kb.InlineKeyboard[2] = []models.InlineKeyboardButton{
-		{Text: fmt.Sprintf("%s (%s)", text.Prayer[int(domain.PrayerIDDhuhr)], dhuhrDelay), CallbackData: "remind:jamaat:edit:dhuhr|"},
-		{Text: fmt.Sprintf("%s (%s)", text.Prayer[int(domain.PrayerIDAsr)], asrDelay), CallbackData: "remind:jamaat:edit:asr|"},
-	}
-
-	maghribDelay := domain.FormatDuration(chat.Reminder.Jamaat.Delay.Maghrib)
-	ishaDelay := domain.FormatDuration(chat.Reminder.Jamaat.Delay.Isha)
-	kb.InlineKeyboard[3] = []models.InlineKeyboardButton{
-		{Text: fmt.Sprintf("%s (%s)", text.Prayer[int(domain.PrayerIDMaghrib)], maghribDelay), CallbackData: "remind:jamaat:edit:maghrib|"},
-		{Text: fmt.Sprintf("%s (%s)", text.Prayer[int(domain.PrayerIDIsha)], ishaDelay), CallbackData: "remind:jamaat:edit:isha|"},
+	for i, prayerID := range prayerIDs {
+		delay := chat.Reminder.Jamaat.Delay.GetDelayByPrayerID(prayerID)
+		kb.InlineKeyboard[i+1] = []models.InlineKeyboardButton{
+			{
+				Text:         fmt.Sprintf("%s (%s)", text.Prayer[int(prayerID)], domain.FormatDuration(delay)),
+				CallbackData: fmt.Sprintf("remind:jamaat:edit:%s|", prayerID.String()),
+			},
+		}
 	}
 
-	kb.InlineKeyboard[4] = []models.InlineKeyboardButton{
+	kb.InlineKeyboard[len(prayerIDs)+1] = []models.InlineKeyboardButton{
 		{Text: buttonBack, CallbackData: "remind:back:menu|"},
 	}
 
diff --git a/serverless/dispatcher/internal/handler/languages/ar.yaml b/serverless/dispatcher/internal/handler/languages/ar.yaml
@@ -117,7 +117,6 @@ info:
     🕌 *إعدادات الجماعة:*
     الحالة: %s
     • الفجر: %s
-    • الشروق: %s
     • الظهر: %s
     • العصر: %s
     • المغرب: %s
diff --git a/serverless/dispatcher/internal/handler/languages/en.yaml b/serverless/dispatcher/internal/handler/languages/en.yaml
@@ -117,7 +117,6 @@ info:
     🕌 *Jamaat Settings:*
     Status: %s
     • Fajr: %s
-    • Shuruq: %s
     • Dhuhr: %s
     • Asr: %s
     • Maghrib: %s
diff --git a/serverless/dispatcher/internal/handler/languages/es.yaml b/serverless/dispatcher/internal/handler/languages/es.yaml
@@ -117,7 +117,6 @@ info:
     🕌 *Configuración de Jamaat:*
     Estado: %s
     • Fajr: %s
-    • Shuruq: %s
     • Dhuhr: %s
     • Asr: %s
     • Maghrib: %s
diff --git a/serverless/dispatcher/internal/handler/languages/fr.yaml b/serverless/dispatcher/internal/handler/languages/fr.yaml
@@ -117,7 +117,6 @@ info:
     🕌 *Paramètres Jamaat:*
     Statut: %s
     • Fajr: %s
-    • Chourouq: %s
     • Dhuhr: %s
     • Asr: %s
     • Maghrib: %s
diff --git a/serverless/dispatcher/internal/handler/languages/ru.yaml b/serverless/dispatcher/internal/handler/languages/ru.yaml
@@ -117,7 +117,6 @@ info:
     🕌 *Настройки Джамаата:*
     Статус: %s
     • Фаджр: %s
-    • Шурук: %s
     • Зухр: %s
     • Аср: %s
     • Магриб: %s
diff --git a/serverless/dispatcher/internal/handler/languages/tr.yaml b/serverless/dispatcher/internal/handler/languages/tr.yaml
@@ -117,7 +117,6 @@ info:
     🕌 *Jemgyýet Sazlamalary:*
     Ýagdaý: %s
     • Fäjir: %s
-    • Şuruk: %s
     • Gündiz: %s
     • Ikindi: %s
     • Agşam: %s
diff --git a/serverless/dispatcher/internal/handler/languages/tt.yaml b/serverless/dispatcher/internal/handler/languages/tt.yaml
@@ -117,7 +117,6 @@ info:
     🕌 *Җәмәгать Көйләүләре:*
     Халәт: %s
     • Фәҗр: %s
-    • Шөрак: %s
     • Зөһр: %s
     • Әср: %s
     • Мәгъриб: %s
diff --git a/serverless/dispatcher/internal/handler/languages/uz.yaml b/serverless/dispatcher/internal/handler/languages/uz.yaml
@@ -118,7 +118,6 @@ info:
     🕌 *Jamoat Sozlamalari:*
     Holat: %s
     • Bomdod: %s
-    • Quyosh: %s
     • Peshin: %s
     • Asr: %s
     • Shom: %s
diff --git a/serverless/loader/go.mod b/serverless/loader/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/aws/aws-sdk-go v1.55.7
-	github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7
+	github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad
 	github.com/ydb-platform/ydb-go-sdk/v3 v3.108.0
 	github.com/ydb-platform/ydb-go-yc v0.12.3
 )
diff --git a/serverless/loader/go.sum b/serverless/loader/go.sum
@@ -589,6 +589,8 @@ github.com/escalopa/prayer-bot v0.0.0-20251026205320-11cb2dcd014e h1:rnAVK8yqKdv
 github.com/escalopa/prayer-bot v0.0.0-20251026205320-11cb2dcd014e/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
 github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7 h1:DO0ejIbuZJJxoxareSryEpp1HGNHRDzCkNUtKwlvhFg=
 github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
+github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad h1:bWmc3gk++my6XDOXRQKfER/xmXkl70Yobw2nQQdcroY=
+github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
diff --git a/serverless/reminder/go.mod b/serverless/reminder/go.mod
@@ -3,7 +3,7 @@ module github.com/escalopa/prayer-bot/reminder
 go 1.21
 
 require (
-	github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7
+	github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad
 	github.com/go-telegram/bot v1.15.0
 	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77
 	github.com/ydb-platform/ydb-go-sdk/v3 v3.108.0
diff --git a/serverless/reminder/go.sum b/serverless/reminder/go.sum
@@ -587,6 +587,8 @@ github.com/escalopa/prayer-bot v0.0.0-20251026205320-11cb2dcd014e h1:rnAVK8yqKdv
 github.com/escalopa/prayer-bot v0.0.0-20251026205320-11cb2dcd014e/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
 github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7 h1:DO0ejIbuZJJxoxareSryEpp1HGNHRDzCkNUtKwlvhFg=
 github.com/escalopa/prayer-bot v0.0.0-20251026211435-73f9e46a72f7/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
+github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad h1:bWmc3gk++my6XDOXRQKfER/xmXkl70Yobw2nQQdcroY=
+github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
diff --git a/serverless/reminder/internal/handler/handler.go b/serverless/reminder/internal/handler/handler.go
@@ -128,7 +128,7 @@ func (h *Handler) Handel(ctx context.Context, botID int64) error {
 			}
 
 			for _, reminder := range reminders {
-				shouldSend, prayerID := reminder.Check(ctx, chat, prayerDay, now)
+				shouldSend, prayerID, nextLastAt := reminder.ShouldTrigger(ctx, chat, prayerDay, now)
 				if !shouldSend {
 					continue
 				}
@@ -148,8 +148,7 @@ func (h *Handler) Handel(ctx context.Context, botID int64) error {
 					continue
 				}
 
-				now = now.Add(1 * time.Minute) // increment by 1 minute to avoid sending the same reminder multiple times
-				err = h.db.UpdateReminder(ctx, chat.BotID, chat.ChatID, reminder.Name(), messageID, now)
+				err = h.db.UpdateReminder(ctx, chat.BotID, chat.ChatID, reminder.Name(), messageID, nextLastAt)
 				if err != nil {
 					log.Error("update reminder state",
 						log.Err(err),
diff --git a/serverless/reminder/internal/handler/reminder.go b/serverless/reminder/internal/handler/reminder.go
@@ -11,7 +11,7 @@ import (
 )
 
 type ReminderType interface {
-	Check(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (shouldSend bool, prayerID domain.PrayerID)
+	ShouldTrigger(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (shouldSend bool, prayerID domain.PrayerID, nextLastAt time.Time)
 	Send(ctx context.Context, b *bot.Bot, chat *domain.Chat, prayerID domain.PrayerID, prayerDay *domain.PrayerDay) (messageID int, err error)
 	Name() domain.ReminderType
 }
@@ -22,19 +22,25 @@ type TomorrowReminder struct {
 	formatPrayerDay func(botID int64, prayerDay *domain.PrayerDay, languageCode string) string
 }
 
-func (r *TomorrowReminder) Check(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (bool, domain.PrayerID) {
+func (r *TomorrowReminder) ShouldTrigger(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (bool, domain.PrayerID, time.Time) {
 	config := chat.Reminder.Tomorrow
+
 	// Trigger logic: last_at + 24h - offset < now
 	lastDate := config.LastAt.Truncate(24 * time.Hour)
 	triggerTime := lastDate.Add(24 * time.Hour).Add(-config.Offset)
-	return triggerTime.Before(now) || triggerTime.Equal(now), domain.PrayerIDUnknown
+	shouldSend := triggerTime.Before(now) || triggerTime.Equal(now)
+
+	// Next LastAt should be tomorrow's date (midnight) to prevent re-triggering on the same day
+	nextLastAt := now.Truncate(24 * time.Hour).Add(24 * time.Hour)
+
+	return shouldSend, domain.PrayerIDUnknown, nextLastAt
 }
 
-func (r *TomorrowReminder) Send(ctx context.Context, b *bot.Bot, chat *domain.Chat, prayerID domain.PrayerID, prayerDay *domain.PrayerDay) (int, error) {
+func (r *TomorrowReminder) Send(ctx context.Context, b *bot.Bot, chat *domain.Chat, _ domain.PrayerID, prayerDay *domain.PrayerDay) (int, error) {
 	deleteMessages(ctx, b, chat, chat.Reminder.Tomorrow.MessageID)
 	res, err := b.SendMessage(ctx, &bot.SendMessageParams{
 		ChatID: chat.ChatID,
-		Text:   r.formatPrayerDay(chat.BotID, prayerDay, chat.LanguageCode),
+		Text:   r.formatPrayerDay(chat.BotID, prayerDay.NextDay, chat.LanguageCode),
 	})
 	if err != nil {
 		return 0, err
@@ -49,7 +55,7 @@ type SoonReminder struct {
 	lp *languagesProvider
 }
 
-func (r *SoonReminder) Check(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (bool, domain.PrayerID) {
+func (r *SoonReminder) ShouldTrigger(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (bool, domain.PrayerID, time.Time) {
 	prayers := []struct {
 		id   domain.PrayerID
 		time time.Time
@@ -69,10 +75,12 @@ func (r *SoonReminder) Check(ctx context.Context, chat *domain.Chat, prayerDay *
 		// logic: last_at < (prayer_time - offset) AND (prayer_time - offset) <= now
 		trigger := p.time.Add(-config.Offset)
 		if config.LastAt.Before(trigger) && (trigger.Before(now) || trigger.Equal(now)) {
-			return true, p.id
+			// // Next LastAt should be incremented by 1 minute to avoid re-triggering
+			// nextLastAt := now.Add(1 * time.Minute)
+			return true, p.id, now
 		}
 	}
-	return false, 0
+	return false, 0, time.Time{}
 }
 
 func (r *SoonReminder) Send(ctx context.Context, b *bot.Bot, chat *domain.Chat, prayerID domain.PrayerID, prayerDay *domain.PrayerDay) (int, error) {
@@ -81,7 +89,7 @@ func (r *SoonReminder) Send(ctx context.Context, b *bot.Bot, chat *domain.Chat,
 
 	deleteMessages(ctx, b, chat, chat.Reminder.Soon.MessageID, chat.Reminder.Arrive.MessageID)
 
-	if chat.Reminder.Jamaat.Enabled {
+	if chat.Reminder.Jamaat.Enabled && prayerID != domain.PrayerIDShuruq {
 		delay := chat.Reminder.Jamaat.Delay.GetDelayByPrayerID(prayerID)
 		message := fmt.Sprintf("%s\n%s",
 			fmt.Sprintf(text.PrayerSoon, prayer, domain.FormatDuration(chat.Reminder.Soon.Offset)),
@@ -126,11 +134,7 @@ type ArriveReminder struct {
 	lp *languagesProvider
 }
 
-func (r *ArriveReminder) Check(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (bool, domain.PrayerID) {
-	if chat.Reminder == nil {
-		return false, 0
-	}
-
+func (r *ArriveReminder) ShouldTrigger(ctx context.Context, chat *domain.Chat, prayerDay *domain.PrayerDay, now time.Time) (bool, domain.PrayerID, time.Time) {
 	config := chat.Reminder.Arrive
 
 	prayers := []struct {
@@ -149,10 +153,12 @@ func (r *ArriveReminder) Check(ctx context.Context, chat *domain.Chat, prayerDay
 		// logic: last_at < prayer_time AND prayer_time <= now
 		if config.LastAt.Before(p.time) &&
 			(p.time.Before(now) || p.time.Equal(now)) {
-			return true, p.id
+			// // Next LastAt should be incremented by 1 minute to avoid re-triggering
+			// nextLastAt := now.Add(1 * time.Minute)
+			return true, p.id, now
 		}
 	}
-	return false, 0
+	return false, 0, time.Time{}
 }
 
 func (r *ArriveReminder) Send(ctx context.Context, b *bot.Bot, chat *domain.Chat, prayerID domain.PrayerID, prayerDay *domain.PrayerDay) (int, error) {
