feat: update serverless

Author: escalopa

_scripts/migrate/README.md

@@ -35,7 +35,7 @@ go run main.go
 3. Transforms the data:
    - Most fields remain the same (chat_id, bot_id, language_code, state, subscribed, subscribed_at, created_at)
    - Creates new `reminder` JSON object with:
-     - `today`: LastAt set to current time (Moscow timezone)
+     - `tomorrow`: LastAt set to current time (Moscow timezone)
      - `soon`: Offset from old `reminder_offset`, MessageID from old `reminder_message_id`
      - `arrive`: MessageID from old `jamaat_message_id`
      - `jamaat`: Enabled if both `subscribed` and `jamaat` were true, with default delay configs
@@ -50,9 +50,10 @@ The script uses UPSERT statements, making it safe to run multiple times. Subsequ
 ### Reminder Field
 
 The reminder JSON structure:
+
 ```json
 {
-  "today": {
+  "tomorrow": {
     "offset": 0,
     "message_id": 0,
     "last_at": "2025-10-26T12:00:00+03:00"

_scripts/migrate/main.go

@@ -43,10 +43,10 @@ type ReminderConfig struct {
 }
 
 type Reminder struct {
-	Today  *ReminderConfig `json:"today"`
-	Soon   *ReminderConfig `json:"soon"`
-	Arrive *ReminderConfig `json:"arrive"`
-	Jamaat *JamaatConfig   `json:"jamaat"`
+	Tomorrow *ReminderConfig `json:"tomorrow"`
+	Soon     *ReminderConfig `json:"soon"`
+	Arrive   *ReminderConfig `json:"arrive"`
+	Jamaat   *JamaatConfig   `json:"jamaat"`
 }
 
 // Old table row structure
@@ -216,7 +216,7 @@ func transformChat(oldChat OldChat, moscowLocation *time.Location) (NewChat, err
 	}
 
 	reminder := Reminder{
-		Today: &ReminderConfig{
+		Tomorrow: &ReminderConfig{
 			Offset: int64(3 * time.Hour),
 			LastAt: now.Format(time.RFC3339),
 		},

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-20251026200218-6f6adf300279
+	github.com/escalopa/prayer-bot v0.0.0-20251026202753-f09b49eedd92
 	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

serverless/dispatcher/go.sum

@@ -579,6 +579,10 @@ github.com/escalopa/prayer-bot v0.0.0-20251026194015-725e9cfbd15d h1:+Dv3qCKHoRc
 github.com/escalopa/prayer-bot v0.0.0-20251026194015-725e9cfbd15d/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
 github.com/escalopa/prayer-bot v0.0.0-20251026200218-6f6adf300279 h1:qc+7zybygYoH1yz948TjHe/uQ6QliqSwEVEd8O9rxug=
 github.com/escalopa/prayer-bot v0.0.0-20251026200218-6f6adf300279/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
+github.com/escalopa/prayer-bot v0.0.0-20251026201902-b5254b301c89 h1:+jbrcX4CpaKUZs0gG+1QbpVENyN9NVbdZLQJOO+d/q0=
+github.com/escalopa/prayer-bot v0.0.0-20251026201902-b5254b301c89/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
+github.com/escalopa/prayer-bot v0.0.0-20251026202753-f09b49eedd92 h1:CZ80HIK0Duq/Rjo1Q+zzFFRNM3mER2fbxBryYu4SFaE=
+github.com/escalopa/prayer-bot v0.0.0-20251026202753-f09b49eedd92/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=

serverless/dispatcher/internal/handler/handler.go

@@ -84,12 +84,10 @@ func (h *Handler) opts() []bot.Option {
 		bot.WithCallbackQueryDataHandler(remindToggleQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindToggleQuery))),
 		bot.WithCallbackQueryDataHandler(remindEditQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindEditQuery))),
 		bot.WithCallbackQueryDataHandler(remindAdjustQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindAdjustQuery))),
-		bot.WithCallbackQueryDataHandler(remindSaveQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindSaveQuery))),
 		bot.WithCallbackQueryDataHandler(remindJamaatMenuQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindJamaatMenuQuery))),
 		bot.WithCallbackQueryDataHandler(remindJamaatToggleQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindJamaatToggleQuery))),
 		bot.WithCallbackQueryDataHandler(remindJamaatEditQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindJamaatEditQuery))),
 		bot.WithCallbackQueryDataHandler(remindJamaatAdjustQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindJamaatAdjustQuery))),
-		bot.WithCallbackQueryDataHandler(remindJamaatSaveQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindJamaatSaveQuery))),
 		bot.WithCallbackQueryDataHandler(remindBackQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindBackQuery))),
 		bot.WithCallbackQueryDataHandler(remindCloseQuery.String(), bot.MatchTypePrefix, h.errorH(h.chatH(h.remindCloseQuery))),
 	}
@@ -242,7 +240,7 @@ func (h *Handler) getChat(ctx context.Context, update *models.Update) (*domain.C
 
 	now := h.now(botID)
 	reminder := &domain.Reminder{
-		Today: &domain.ReminderConfig{
+		Tomorrow: &domain.ReminderConfig{
 			LastAt: now,
 			Offset: 3 * time.Hour,
 		},

serverless/dispatcher/internal/handler/helper.go

@@ -87,3 +87,8 @@ func parseAdjustment(adj string) time.Duration {
 	}
 	return 0
 }
+
+// isChatGroup checks if the chat is a group or supergroup.
+func isChatGroup(chatID int64) bool {
+	return chatID < 0
+}

serverless/dispatcher/internal/handler/keyboard.go

@@ -14,6 +14,8 @@ const (
 	monthsPerRow    = 3
 	remindPerRow    = 4
 	daysPerRow      = 5
+
+	buttonBack = "🔙"
 )
 
 func (h *Handler) languagesKeyboard() *models.InlineKeyboardMarkup {
@@ -93,39 +95,50 @@ func (h *Handler) daysKeyboard(now time.Time, month int) *models.InlineKeyboardM
 func (h *Handler) remindMenuKeyboard(chat *domain.Chat) *models.InlineKeyboardMarkup {
 	text := h.lp.GetText(chat.LanguageCode)
 
-	kb := &models.InlineKeyboardMarkup{InlineKeyboard: make([][]models.InlineKeyboardButton, 4)}
+	// Calculate number of rows based on whether it's a group
+	numRows := 3
+	if isChatGroup(chat.ChatID) {
+		numRows = 4
+	}
+	kb := &models.InlineKeyboardMarkup{InlineKeyboard: make([][]models.InlineKeyboardButton, numRows)}
+
+	rowIndex := 0
 
 	if chat.Subscribed {
-		kb.InlineKeyboard[0] = []models.InlineKeyboardButton{
+		kb.InlineKeyboard[rowIndex] = []models.InlineKeyboardButton{
 			{Text: text.RemindMenu.Disable, CallbackData: "remind:toggle|"},
 		}
 	} else {
-		kb.InlineKeyboard[0] = []models.InlineKeyboardButton{
+		kb.InlineKeyboard[rowIndex] = []models.InlineKeyboardButton{
 			{Text: text.RemindMenu.Enable, CallbackData: "remind:toggle|"},
 		}
 	}
+	rowIndex++
 
-	todayOffset := domain.FormatDuration(chat.Reminder.Today.Offset)
+	tomorrowOffset := domain.FormatDuration(chat.Reminder.Tomorrow.Offset)
 	soonOffset := domain.FormatDuration(chat.Reminder.Soon.Offset)
-	kb.InlineKeyboard[1] = []models.InlineKeyboardButton{
-		{Text: fmt.Sprintf("%s (%s)", text.RemindMenu.Today, todayOffset), CallbackData: "remind:edit:today|"},
+	kb.InlineKeyboard[rowIndex] = []models.InlineKeyboardButton{
+		{Text: fmt.Sprintf("%s (%s)", text.RemindMenu.Tomorrow, tomorrowOffset), CallbackData: "remind:edit:tomorrow|"},
 		{Text: fmt.Sprintf("%s (%s)", text.RemindMenu.Soon, soonOffset), CallbackData: "remind:edit:soon|"},
 	}
+	rowIndex++
 
-	kb.InlineKeyboard[2] = []models.InlineKeyboardButton{
-		{Text: text.RemindMenu.JamaatSettings, CallbackData: "remind:jamaat:menu|"},
+	// Only show Jamaat Settings for group chats
+	if isChatGroup(chat.ChatID) {
+		kb.InlineKeyboard[rowIndex] = []models.InlineKeyboardButton{
+			{Text: text.RemindMenu.JamaatSettings, CallbackData: "remind:jamaat:menu|"},
+		}
+		rowIndex++
 	}
 
-	kb.InlineKeyboard[3] = []models.InlineKeyboardButton{
+	kb.InlineKeyboard[rowIndex] = []models.InlineKeyboardButton{
 		{Text: text.RemindMenu.Close, CallbackData: "remind:close|"},
 	}
 
 	return kb
 }
 
 func (h *Handler) remindEditKeyboard(reminderType domain.ReminderType, languageCode string) *models.InlineKeyboardMarkup {
-	text := h.lp.GetText(languageCode)
-
 	kb := &models.InlineKeyboardMarkup{InlineKeyboard: make([][]models.InlineKeyboardButton, 3)}
 
 	kb.InlineKeyboard[0] = []models.InlineKeyboardButton{
@@ -141,8 +154,7 @@ func (h *Handler) remindEditKeyboard(reminderType domain.ReminderType, languageC
 	}
 
 	kb.InlineKeyboard[2] = []models.InlineKeyboardButton{
-		{Text: text.Buttons.Save, CallbackData: fmt.Sprintf("remind:save:%s|", reminderType)},
-		{Text: text.Buttons.Back, CallbackData: "remind:back:menu|"},
+		{Text: buttonBack, CallbackData: "remind:back:menu|"},
 	}
 
 	return kb
@@ -185,15 +197,13 @@ func (h *Handler) jammatMenuKeyboard(chat *domain.Chat) *models.InlineKeyboardMa
 	}
 
 	kb.InlineKeyboard[4] = []models.InlineKeyboardButton{
-		{Text: text.Buttons.Back, CallbackData: "remind:back:menu|"},
+		{Text: buttonBack, CallbackData: "remind:back:menu|"},
 	}
 
 	return kb
 }
 
 func (h *Handler) jammatEditKeyboard(prayerID domain.PrayerID, languageCode string) *models.InlineKeyboardMarkup {
-	text := h.lp.GetText(languageCode)
-
 	kb := &models.InlineKeyboardMarkup{InlineKeyboard: make([][]models.InlineKeyboardButton, 3)}
 
 	prayerName := prayerID.String()
@@ -211,8 +221,7 @@ func (h *Handler) jammatEditKeyboard(prayerID domain.PrayerID, languageCode stri
 	}
 
 	kb.InlineKeyboard[2] = []models.InlineKeyboardButton{
-		{Text: text.Buttons.Save, CallbackData: fmt.Sprintf("remind:jamaat:save:%s|", prayerName)},
-		{Text: text.Buttons.Back, CallbackData: "remind:back:jamaat|"},
+		{Text: buttonBack, CallbackData: "remind:back:jamaat|"},
 	}
 
 	return kb

serverless/dispatcher/internal/handler/languages.go

@@ -30,15 +30,15 @@ type (
 		TitleDisabled  string `yaml:"title_disabled"`
 		Enable         string `yaml:"enable"`
 		Disable        string `yaml:"disable"`
-		Today          string `yaml:"today"`
+		Tomorrow       string `yaml:"tomorrow"`
 		Soon           string `yaml:"soon"`
 		JamaatSettings string `yaml:"jamaat_settings"`
 		Close          string `yaml:"close"`
 	}
 
 	RemindEditText struct {
-		TitleToday string `yaml:"title_today"`
-		TitleSoon  string `yaml:"title_soon"`
+		TitleTomorrow string `yaml:"title_tomorrow"`
+		TitleSoon     string `yaml:"title_soon"`
 	}
 
 	JamaatMenuText struct {

serverless/dispatcher/internal/handler/languages/ar.yaml

@@ -43,31 +43,27 @@ language:
   success: "✅ تم تغيير اللغة إلى *%s*"
 
 remind_menu:
-  title_enabled: "⚙️ إعدادات التذكير - مفعّل"
-  title_disabled: "⚙️ إعدادات التذكير - معطّل"
+  title_enabled: "⚙️ التذكيرات - مفعّل ✅"
+  title_disabled: "⚙️ التذكيرات - معطّل 🔕"
   enable: "🔔 تفعيل"
   disable: "🔕 تعطيل"
-  today: "⏰ اليوم"
-  soon: "🔜 قريباً"
-  jamaat_settings: "🕌 إعدادات الجماعة"
+  tomorrow: "🌅 معاينة الغد"
+  soon: "⏰ تنبيه الصلاة"
+  jamaat_settings: "🕌 مواعيد الجماعة"
   close: "❌ إغلاق"
 
 remind_edit:
-  title_today: "⏰ اليوم"
-  title_soon: "🔜 قريباً"
+  title_tomorrow: "🌅 معاينة الغد\n⏰ إرسال مواقيت صلاة الغد قبل منتصف الليل"
+  title_soon: "⏰ تنبيه الصلاة\n⏱ التذكير قبل كل وقت صلاة"
 
 jamaat_menu:
-  title_enabled: "🕌 إعدادات الجماعة - مفعّل"
-  title_disabled: "🕌 إعدادات الجماعة - معطّل"
+  title_enabled: "🕌 مواعيد الجماعة - مفعّل ✅\n(للمجموعات فقط)"
+  title_disabled: "🕌 مواعيد الجماعة - معطّل 🔕\n(للمجموعات فقط)"
   enable: "🔔 تفعيل"
   disable: "🔕 تعطيل"
 
 jamaat_edit:
-  title: "تأخير جماعة %s"
-
-buttons:
-  save: "💾"
-  back: "🔙"
+  title: "🕌 موعد جماعة %s\n⏱ الوقت بعد الأذان"
 
 help: |
   هل تحتاج مساعدة؟ 😊 إليك ما يمكنني فعله: 👇

serverless/dispatcher/internal/handler/languages/en.yaml

@@ -43,31 +43,27 @@ language:
   success: "✅ Language changed to *%s*"
 
 remind_menu:
-  title_enabled: "⚙️ Configure Reminders - Enabled"
-  title_disabled: "⚙️ Configure Reminders - Disabled"
+  title_enabled: "⚙️ Reminders - Enabled ✅"
+  title_disabled: "⚙️ Reminders - Disabled 🔕"
   enable: "🔔 Enable"
   disable: "🔕 Disable"
-  today: "⏰ Today"
-  soon: "🔜 Soon"
-  jamaat_settings: "🕌 Jamaat Settings"
+  tomorrow: "🌅 Tomorrow Preview"
+  soon: "⏰ Prayer Alert"
+  jamaat_settings: "🕌 Jamaat Times"
   close: "❌ Close"
 
 remind_edit:
-  title_today: "⏰ Today"
-  title_soon: "🔜 Soon"
+  title_tomorrow: "🌅 Tomorrow Preview\n⏰ Send tomorrow's prayer times before midnight"
+  title_soon: "⏰ Prayer Alert\n⏱ Remind before each prayer time"
 
 jamaat_menu:
-  title_enabled: "🕌 Jamaat Settings - Enabled"
-  title_disabled: "🕌 Jamaat Settings - Disabled"
+  title_enabled: "🕌 Jamaat Times - Enabled ✅\n(Group Only)"
+  title_disabled: "🕌 Jamaat Times - Disabled 🔕\n(Group Only)"
   enable: "🔔 Enable"
   disable: "🔕 Disable"
 
 jamaat_edit:
-  title: "%s Jamaat Delay"
-
-buttons:
-  save: "💾"
-  back: "🔙"
+  title: "🕌 %s Jamaat Time\n⏱ Time after Adhan"
 
 help: |
   Need help? 😊 Here's what I can do: 👇