Skip to content

Commit 0557d95

Browse files
escalopaescalopa
committed
fix: use domain.Duration properly
1 parent e7cacf2 commit 0557d95

File tree

12 files changed

+48
-55
lines changed

12 files changed

+48
-55
lines changed

‎serverless/dispatcher/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/escalopa/prayer-bot/dispatcher
33
go 1.21
44

55
require (
6-
github.com/escalopa/prayer-bot v0.0.0-20251102105549-ebc4c681afa2
6+
github.com/escalopa/prayer-bot v0.0.0-20251102114226-e7cacf22daf1
77
github.com/go-telegram/bot v1.15.0
88
github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77
99
github.com/ydb-platform/ydb-go-sdk/v3 v3.108.0

‎serverless/dispatcher/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,8 @@ github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad h1:bWmc3gk++my
591591
github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
592592
github.com/escalopa/prayer-bot v0.0.0-20251102105549-ebc4c681afa2 h1:JqgNa7R7hRsEV2uNslRcbioATTwlVBAJh9vqsdwYR9c=
593593
github.com/escalopa/prayer-bot v0.0.0-20251102105549-ebc4c681afa2/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
594+
github.com/escalopa/prayer-bot v0.0.0-20251102114226-e7cacf22daf1 h1:s9sqt4CtdExFGlZz1k2SDB2rA2elyMHR7I59MJ9c1lg=
595+
github.com/escalopa/prayer-bot v0.0.0-20251102114226-e7cacf22daf1/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
594596
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
595597
github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
596598
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

‎serverless/dispatcher/internal/handler/command.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,11 @@ func (h *Handler) info(ctx context.Context, b *bot.Bot, _ *models.Update) error
335335
}
336336
jamaatInfo = fmt.Sprintf(text.Info.Jamaat,
337337
jamaatStatus,
338-
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Fajr),
339-
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Dhuhr),
340-
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Asr),
341-
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Maghrib),
342-
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Isha),
338+
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Fajr.Duration()),
339+
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Dhuhr.Duration()),
340+
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Asr.Duration()),
341+
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Maghrib.Duration()),
342+
domain.FormatDuration(chat.Reminder.Jamaat.Delay.Isha.Duration()),
343343
)
344344
}
345345

@@ -349,8 +349,8 @@ func (h *Handler) info(ctx context.Context, b *bot.Bot, _ *models.Update) error
349349
chat.LanguageCode,
350350
chat.State,
351351
subscriptionStatus,
352-
domain.FormatDuration(chat.Reminder.Tomorrow.Offset),
353-
domain.FormatDuration(chat.Reminder.Soon.Offset),
352+
domain.FormatDuration(chat.Reminder.Tomorrow.Offset.Duration()),
353+
domain.FormatDuration(chat.Reminder.Soon.Offset.Duration()),
354354
jamaatInfo,
355355
)
356356

‎serverless/dispatcher/internal/handler/handler.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,20 +240,20 @@ func (h *Handler) getChat(ctx context.Context, update *models.Update) (*domain.C
240240
reminder := &domain.Reminder{
241241
Tomorrow: &domain.ReminderConfig{
242242
LastAt: now,
243-
Offset: 3 * time.Hour,
243+
Offset: domain.Duration(3 * time.Hour),
244244
},
245245
Soon: &domain.ReminderConfig{
246246
LastAt: now,
247-
Offset: 20 * time.Minute,
247+
Offset: domain.Duration(20 * time.Minute),
248248
},
249249
Arrive: &domain.ReminderConfig{LastAt: now},
250250
Jamaat: &domain.JamaatConfig{
251251
Delay: &domain.JamaatDelayConfig{
252-
Fajr: 10 * time.Minute,
253-
Dhuhr: 10 * time.Minute,
254-
Asr: 10 * time.Minute,
255-
Maghrib: 10 * time.Minute,
256-
Isha: 20 * time.Minute,
252+
Fajr: domain.Duration(10 * time.Minute),
253+
Dhuhr: domain.Duration(10 * time.Minute),
254+
Asr: domain.Duration(10 * time.Minute),
255+
Maghrib: domain.Duration(10 * time.Minute),
256+
Isha: domain.Duration(20 * time.Minute),
257257
},
258258
},
259259
}

‎serverless/dispatcher/internal/handler/keyboard.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ func (h *Handler) remindMenuKeyboard(chat *domain.Chat) *models.InlineKeyboardMa
115115
}
116116
rowIndex++
117117

118-
tomorrowOffset := domain.FormatDuration(chat.Reminder.Tomorrow.Offset)
118+
tomorrowOffset := domain.FormatDuration(chat.Reminder.Tomorrow.Offset.Duration())
119119
kb.InlineKeyboard[rowIndex] = []models.InlineKeyboardButton{
120120
{Text: fmt.Sprintf("%s (%s)", text.RemindMenu.Tomorrow, tomorrowOffset), CallbackData: "remind:edit:tomorrow|"},
121121
}
122122
rowIndex++
123123

124-
soonOffset := domain.FormatDuration(chat.Reminder.Soon.Offset)
124+
soonOffset := domain.FormatDuration(chat.Reminder.Soon.Offset.Duration())
125125
kb.InlineKeyboard[rowIndex] = []models.InlineKeyboardButton{
126126
{Text: fmt.Sprintf("%s (%s)", text.RemindMenu.Soon, soonOffset), CallbackData: "remind:edit:soon|"},
127127
}

‎serverless/dispatcher/internal/handler/query.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ func (h *Handler) remindEditQuery(ctx context.Context, b *bot.Bot, update *model
230230
var offset time.Duration
231231
switch reminderType {
232232
case domain.ReminderTypeTomorrow:
233-
offset = chat.Reminder.Tomorrow.Offset
233+
offset = chat.Reminder.Tomorrow.Offset.Duration()
234234
messageText = fmt.Sprintf("%s - %s", text.RemindEdit.TitleTomorrow, domain.FormatDuration(offset))
235235
case domain.ReminderTypeSoon:
236-
offset = chat.Reminder.Soon.Offset
236+
offset = chat.Reminder.Soon.Offset.Duration()
237237
messageText = fmt.Sprintf("%s - %s", text.RemindEdit.TitleSoon, domain.FormatDuration(offset))
238238
default:
239239
log.Error("remindEditQuery: unknown reminder type",
@@ -281,11 +281,11 @@ func (h *Handler) remindAdjustQuery(ctx context.Context, b *bot.Bot, update *mod
281281

282282
switch reminderType {
283283
case domain.ReminderTypeTomorrow:
284-
currentOffset = chat.Reminder.Tomorrow.Offset
284+
currentOffset = chat.Reminder.Tomorrow.Offset.Duration()
285285
minOffset = TomorrowMinOffset
286286
maxOffset = TomorrowMaxOffset
287287
case domain.ReminderTypeSoon:
288-
currentOffset = chat.Reminder.Soon.Offset
288+
currentOffset = chat.Reminder.Soon.Offset.Duration()
289289
minOffset = SoonMinOffset
290290
maxOffset = SoonMaxOffset
291291
default:
@@ -309,9 +309,9 @@ func (h *Handler) remindAdjustQuery(ctx context.Context, b *bot.Bot, update *mod
309309

310310
switch reminderType {
311311
case domain.ReminderTypeTomorrow:
312-
chat.Reminder.Tomorrow.Offset = newOffset
312+
chat.Reminder.Tomorrow.Offset = domain.Duration(newOffset)
313313
case domain.ReminderTypeSoon:
314-
chat.Reminder.Soon.Offset = newOffset
314+
chat.Reminder.Soon.Offset = domain.Duration(newOffset)
315315
}
316316

317317
ctx = setContextChat(ctx, chat)

‎serverless/dispatcher/internal/service/db.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@ func (db *DB) SetReminderOffset(ctx context.Context, botID int64, chatID int64,
275275
return db.updateReminder(ctx, botID, chatID, func(reminder *domain.Reminder) {
276276
switch reminderType {
277277
case domain.ReminderTypeTomorrow:
278-
reminder.Tomorrow.Offset = offset
278+
reminder.Tomorrow.Offset = domain.Duration(offset)
279279
reminder.Tomorrow.LastAt = time.Now()
280280
case domain.ReminderTypeSoon:
281-
reminder.Soon.Offset = offset
281+
reminder.Soon.Offset = domain.Duration(offset)
282282
reminder.Soon.LastAt = time.Now()
283283
}
284284
})

‎serverless/loader/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
require (
66
github.com/aws/aws-sdk-go v1.55.7
7-
github.com/escalopa/prayer-bot v0.0.0-20251102105549-ebc4c681afa2
7+
github.com/escalopa/prayer-bot v0.0.0-20251102114226-e7cacf22daf1
88
github.com/ydb-platform/ydb-go-sdk/v3 v3.108.0
99
github.com/ydb-platform/ydb-go-yc v0.12.3
1010
)

‎serverless/loader/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,8 @@ github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad h1:bWmc3gk++my
593593
github.com/escalopa/prayer-bot v0.0.0-20251026213512-5af98b73d4ad/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
594594
github.com/escalopa/prayer-bot v0.0.0-20251102105549-ebc4c681afa2 h1:JqgNa7R7hRsEV2uNslRcbioATTwlVBAJh9vqsdwYR9c=
595595
github.com/escalopa/prayer-bot v0.0.0-20251102105549-ebc4c681afa2/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
596+
github.com/escalopa/prayer-bot v0.0.0-20251102114226-e7cacf22daf1 h1:s9sqt4CtdExFGlZz1k2SDB2rA2elyMHR7I59MJ9c1lg=
597+
github.com/escalopa/prayer-bot v0.0.0-20251102114226-e7cacf22daf1/go.mod h1:HOpIxziLKMTC/a+Q6z40Rn5tJDEZsFyzhniLA4iB2i0=
596598
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
597599
github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
598600
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

‎serverless/reminder/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ module github.com/escalopa/prayer-bot/reminder
33
go 1.21
44

55
require (
6-
github.com/escalopa/prayer-bot v0.0.0-20251102105549-ebc4c681afa2
6+
github.com/escalopa/prayer-bot v0.0.0-20251102114226-e7cacf22daf1
77
github.com/go-telegram/bot v1.15.0
8-
github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77
98
github.com/ydb-platform/ydb-go-sdk/v3 v3.108.0
109
github.com/ydb-platform/ydb-go-yc v0.12.3
1110
golang.org/x/sync v0.10.0
@@ -18,6 +17,7 @@ require (
1817
github.com/google/uuid v1.6.0 // indirect
1918
github.com/jonboulle/clockwork v0.3.0 // indirect
2019
github.com/yandex-cloud/go-genproto v0.0.0-20240819112322-98a264d392f6 // indirect
20+
github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 // indirect
2121
github.com/ydb-platform/ydb-go-yc-metadata v0.6.1 // indirect
2222
golang.org/x/net v0.33.0 // indirect
2323
golang.org/x/sys v0.28.0 // indirect

0 commit comments

Comments
 (0)