feat(platform): route scheduler notifications through platform messenger

src/GmRelay.Bot/Infrastructure/Scheduling/ISessionTriggerStore.cs

@@ -1,86 +0,0 @@
-using Dapper;
-using GmRelay.Shared.Domain;
-using Npgsql;
-
-namespace GmRelay.Bot.Infrastructure.Scheduling;
-
-public interface ISessionTriggerStore
-{
-    Task<IReadOnlyList<Guid>> GetSessionsNeedingConfirmationAsync(DateTimeOffset now, CancellationToken ct);
-    Task<IReadOnlyList<Guid>> GetSessionsNeedingOneHourReminderAsync(DateTimeOffset now, CancellationToken ct);
-    Task<IReadOnlyList<Guid>> GetSessionsNeedingJoinLinkAsync(DateTimeOffset now, CancellationToken ct);
-}
-
-public sealed class DbSessionTriggerStore(NpgsqlDataSource dataSource) : ISessionTriggerStore
-{
-    private static readonly TimeSpan ConfirmationLeadTime = TimeSpan.FromHours(24);
-    private static readonly TimeSpan OneHourReminderLeadTime = TimeSpan.FromHours(1);
-    private static readonly TimeSpan JoinLinkLeadTime = TimeSpan.FromMinutes(5);
-
-    public async Task<IReadOnlyList<Guid>> GetSessionsNeedingConfirmationAsync(DateTimeOffset now, CancellationToken ct)
-    {
-        await using var connection = await dataSource.OpenConnectionAsync(ct);
-
-        var results = await connection.QueryAsync<Guid>(
-            """
-            SELECT id
-            FROM sessions
-            WHERE status = @Planned
-              AND scheduled_at - @LeadTime <= @Now
-              AND confirmation_sent_at IS NULL
-            """,
-            new
-            {
-                Planned = SessionStatus.Planned,
-                LeadTime = ConfirmationLeadTime,
-                Now = now.UtcDateTime
-            });
-
-        return results.ToList();
-    }
-
-    public async Task<IReadOnlyList<Guid>> GetSessionsNeedingOneHourReminderAsync(DateTimeOffset now, CancellationToken ct)
-    {
-        await using var connection = await dataSource.OpenConnectionAsync(ct);
-
-        var results = await connection.QueryAsync<Guid>(
-            """
-            SELECT id
-            FROM sessions
-            WHERE status IN (@Confirmed, @ConfirmationSent)
-              AND scheduled_at - @LeadTime <= @Now
-              AND one_hour_reminder_processed_at IS NULL
-            """,
-            new
-            {
-                Confirmed = SessionStatus.Confirmed,
-                ConfirmationSent = SessionStatus.ConfirmationSent,
-                LeadTime = OneHourReminderLeadTime,
-                Now = now.UtcDateTime
-            });
-
-        return results.ToList();
-    }
-
-    public async Task<IReadOnlyList<Guid>> GetSessionsNeedingJoinLinkAsync(DateTimeOffset now, CancellationToken ct)
-    {
-        await using var connection = await dataSource.OpenConnectionAsync(ct);
-
-        var results = await connection.QueryAsync<Guid>(
-            """
-            SELECT id
-            FROM sessions
-            WHERE status = @Confirmed
-              AND scheduled_at - @LeadTime <= @Now
-              AND link_message_id IS NULL
-            """,
-            new
-            {
-                Confirmed = SessionStatus.Confirmed,
-                LeadTime = JoinLinkLeadTime,
-                Now = now.UtcDateTime
-            });
-
-        return results.ToList();
-    }
-}

src/GmRelay.Bot/Infrastructure/Scheduling/SessionSchedulerService.cs

@@ -1,146 +0,0 @@
-using GmRelay.Bot.Features.Confirmation.SendConfirmation;
-using GmRelay.Bot.Features.Reminders.SendJoinLink;
-using GmRelay.Bot.Features.Reminders.SendOneHourReminder;
-using GmRelay.Shared.Platform;
-
-namespace GmRelay.Bot.Infrastructure.Scheduling;
-
-/// <summary>
-/// Stateless scheduler: wakes every 60 seconds, queries PostgreSQL for actionable sessions.
-/// Three triggers:
-///   T-24h: send confirmation request with inline keyboard
-///   T-1h:  send one-hour direct reminder
-///   T-5min: send join link to all confirmed players
-///
-/// If the Raspberry Pi reboots, nothing is lost — all state is in the DB.
-/// </summary>
-public sealed class SessionSchedulerService(
-    ISessionTriggerStore triggerStore,
-    ISendConfirmationHandler confirmationHandler,
-    ISendOneHourReminderHandler oneHourReminderHandler,
-    ISendJoinLinkHandler joinLinkHandler,
-    ISystemClock clock,
-    ILogger<SessionSchedulerService> logger) : BackgroundService
-{
-    private static readonly TimeSpan TickInterval = TimeSpan.FromMinutes(1);
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        logger.LogInformation("Session scheduler started (interval: {Interval})", TickInterval);
-
-        using var timer = new PeriodicTimer(TickInterval);
-
-        do
-        {
-            try
-            {
-                await TickAsync(stoppingToken);
-            }
-            catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
-            {
-                break;
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Scheduler tick failed, will retry next tick");
-            }
-        }
-        while (await timer.WaitForNextTickAsync(stoppingToken));
-
-        logger.LogInformation("Session scheduler stopped");
-    }
-
-    /// <summary>
-    /// Runs a single scheduler tick using the current clock time.
-    /// Public so it can be called from integration tests with a fake clock.
-    /// </summary>
-    public async Task TickAsync(CancellationToken ct)
-    {
-        var now = clock.UtcNow;
-
-        await ProcessConfirmationTriggers(now, ct);
-        await ProcessOneHourReminderTriggers(now, ct);
-        await ProcessJoinLinkTriggers(now, ct);
-    }
-
-    private async Task ProcessConfirmationTriggers(DateTimeOffset now, CancellationToken ct)
-    {
-        IReadOnlyList<Guid> sessionIds;
-        try
-        {
-            sessionIds = await triggerStore.GetSessionsNeedingConfirmationAsync(now, ct);
-        }
-        catch (Exception ex)
-        {
-            logger.LogError(ex, "Failed to query confirmation triggers");
-            return;
-        }
-
-        foreach (var sessionId in sessionIds)
-        {
-            try
-            {
-                await confirmationHandler.HandleAsync(sessionId, ct);
-                logger.LogInformation("Confirmation sent for session {SessionId}", sessionId);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Failed to send confirmation for session {SessionId}", sessionId);
-            }
-        }
-    }
-
-    private async Task ProcessOneHourReminderTriggers(DateTimeOffset now, CancellationToken ct)
-    {
-        IReadOnlyList<Guid> sessionIds;
-        try
-        {
-            sessionIds = await triggerStore.GetSessionsNeedingOneHourReminderAsync(now, ct);
-        }
-        catch (Exception ex)
-        {
-            logger.LogError(ex, "Failed to query one-hour reminder triggers");
-            return;
-        }
-
-        foreach (var sessionId in sessionIds)
-        {
-            try
-            {
-                await oneHourReminderHandler.HandleAsync(sessionId, ct);
-                logger.LogInformation("One-hour reminder processed for session {SessionId}", sessionId);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Failed to process one-hour reminder for session {SessionId}", sessionId);
-            }
-        }
-    }
-
-    private async Task ProcessJoinLinkTriggers(DateTimeOffset now, CancellationToken ct)
-    {
-        IReadOnlyList<Guid> sessionIds;
-        try
-        {
-            sessionIds = await triggerStore.GetSessionsNeedingJoinLinkAsync(now, ct);
-        }
-        catch (Exception ex)
-        {
-            logger.LogError(ex, "Failed to query join-link triggers");
-            return;
-        }
-
-        foreach (var sessionId in sessionIds)
-        {
-            try
-            {
-                await joinLinkHandler.HandleAsync(sessionId, ct);
-                logger.LogInformation("Join link sent for session {SessionId}", sessionId);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Failed to send join link for session {SessionId}", sessionId);
-            }
-        }
-    }
-}

src/GmRelay.Bot/Infrastructure/Telegram/TelegramPlatformMessenger.cs

@@ -1,4 +1,6 @@
 using System.Globalization;
+using GmRelay.Bot.Features.Sessions.RescheduleSession;
+using GmRelay.Shared.Domain;
 using GmRelay.Shared.Platform;
 using Telegram.Bot;
 using Telegram.Bot.Types;
@@ -125,6 +127,135 @@ public sealed class TelegramPlatformMessenger(
             cancellationToken: ct);
     }
 
+    public async Task<PlatformMessageRef> SendConfirmationRequestAsync(PlatformConfirmationRequest request, CancellationToken ct)
+    {
+        EnsureTelegram(request.Group.Platform);
+
+        var chatId = ParseLong(request.Group.ExternalGroupId);
+        var threadId = ParseNullableInt(request.Group.ExternalThreadId);
+        var message = await bot.SendMessage(
+            chatId: chatId,
+            messageThreadId: threadId,
+            text: BuildConfirmationText(request),
+            parseMode: ParseMode.Html,
+            replyMarkup: BuildRsvpKeyboard(request.SessionId),
+            cancellationToken: ct);
+
+        return TelegramPlatformIds.Message(chatId, threadId, message.MessageId);
+    }
+
+    public async Task UpdateConfirmationRequestAsync(PlatformRsvpMessageUpdate update, CancellationToken ct)
+    {
+        var request = update.Request;
+        EnsureTelegram(request.Group.Platform);
+        var existingMessage = request.ExistingMessage
+            ?? throw new ArgumentException("Existing confirmation message reference is required.", nameof(update));
+
+        EnsureTelegram(existingMessage.Platform);
+        await bot.EditMessageText(
+            chatId: ParseLong(existingMessage.ExternalGroupId),
+            messageId: ParseInt(existingMessage.ExternalMessageId),
+            text: BuildConfirmationText(request),
+            parseMode: ParseMode.Html,
+            replyMarkup: update.DisableActions ? null : BuildRsvpKeyboard(request.SessionId),
+            cancellationToken: ct);
+    }
+
+    public async Task<PlatformMessageRef> SendJoinLinkNotificationAsync(
+        PlatformJoinLinkNotification notification,
+        CancellationToken ct)
+    {
+        EnsureTelegram(notification.Group.Platform);
+
+        var chatId = ParseLong(notification.Group.ExternalGroupId);
+        var threadId = ParseNullableInt(notification.Group.ExternalThreadId);
+        var message = await bot.SendMessage(
+            chatId: chatId,
+            messageThreadId: threadId,
+            text: BuildJoinLinkText(notification),
+            cancellationToken: ct);
+
+        return TelegramPlatformIds.Message(chatId, threadId, message.MessageId);
+    }
+
+    public Task SendDirectSessionNotificationAsync(
+        PlatformDirectSessionNotification notification,
+        CancellationToken ct)
+    {
+        EnsureTelegram(notification.Recipient.Platform);
+        return bot.SendMessage(
+            chatId: ParseLong(notification.Recipient.ExternalUserId),
+            text: BuildDirectNotificationText(notification),
+            parseMode: ParseMode.Html,
+            cancellationToken: ct);
+    }
+
+    public async Task SendRsvpOutcomeAsync(PlatformRsvpOutcomeNotification notification, CancellationToken ct)
+    {
+        switch (notification.Kind)
+        {
+            case PlatformRsvpOutcomeKind.GroupAllConfirmed:
+                if (notification.Group is null)
+                {
+                    throw new ArgumentException("Group notification requires a group.", nameof(notification));
+                }
+
+                EnsureTelegram(notification.Group.Platform);
+                await bot.SendMessage(
+                    chatId: ParseLong(notification.Group.ExternalGroupId),
+                    messageThreadId: ParseNullableInt(notification.Group.ExternalThreadId),
+                    text: $"🎉 Игра «{notification.Title}» подтверждена! Все участники на месте.",
+                    cancellationToken: ct);
+                break;
+
+            case PlatformRsvpOutcomeKind.GmAllConfirmed:
+            case PlatformRsvpOutcomeKind.GmPlayerDeclined:
+                foreach (var recipient in notification.Recipients)
+                {
+                    EnsureTelegram(recipient.Platform);
+                    await bot.SendMessage(
+                        chatId: ParseLong(recipient.ExternalUserId),
+                        text: BuildRsvpOutcomeDirectText(notification),
+                        parseMode: ParseMode.Html,
+                        cancellationToken: ct);
+                }
+
+                break;
+
+            default:
+                throw new ArgumentOutOfRangeException(nameof(notification), notification.Kind, "Unknown RSVP outcome kind.");
+        }
+    }
+
+    public Task UpdateRescheduleVoteAsync(PlatformRescheduleVoteUpdate update, CancellationToken ct)
+    {
+        EnsureTelegram(update.Group.Platform);
+        EnsureTelegram(update.ExistingMessage.Platform);
+
+        var resultText = update.SelectedOption is not null
+            ? $"✅ <b>Голосование завершено.</b>\nПобедил вариант {update.SelectedOption.DisplayOrder}: <b>{update.SelectedOption.ProposedAt.FormatMoscow()}</b> (МСК)."
+            : $"❌ <b>Голосование завершено.</b>\n{System.Net.WebUtility.HtmlEncode(update.Decision.Reason)}";
+
+        var text = $"""
+            {HandleRescheduleTimeInputHandler.BuildVotingMessage(
+                update.Title,
+                update.CurrentScheduledAt,
+                update.VotingDeadlineAt,
+                update.Options,
+                update.Participants,
+                update.Votes)}
+
+            {resultText}
+            """;
+
+        return bot.EditMessageText(
+            chatId: ParseLong(update.ExistingMessage.ExternalGroupId),
+            messageId: ParseInt(update.ExistingMessage.ExternalMessageId),
+            text: text,
+            parseMode: ParseMode.Html,
+            cancellationToken: ct);
+    }
+
     private async Task<Message> SendScheduleTextMessage(
         long chatId,
         int? threadId,
@@ -139,6 +270,134 @@ public sealed class TelegramPlatformMessenger(
             replyMarkup: markup,
             cancellationToken: ct);
 
+    private static string BuildConfirmationText(PlatformConfirmationRequest request)
+    {
+        var confirmed = request.Participants.Where(p => p.RsvpStatus == RsvpStatus.Confirmed).ToList();
+        var declined = request.Participants.Where(p => p.RsvpStatus == RsvpStatus.Declined).ToList();
+        var pending = request.Participants.Where(p => p.RsvpStatus == RsvpStatus.Pending).ToList();
+
+        var lines = new List<string>
+        {
+            $"🎲 Подтвердите участие в «{System.Net.WebUtility.HtmlEncode(request.Title)}»",
+            $"📅 {request.ScheduledAt.FormatMoscow()} (МСК)",
+            string.Empty
+        };
+
+        foreach (var participant in confirmed)
+        {
+            lines.Add($"   ✅ {FormatTelegramParticipant(participant)}");
+        }
+
+        foreach (var participant in declined)
+        {
+            lines.Add($"   ❌ <s>{FormatTelegramParticipant(participant)}</s>");
+        }
+
+        foreach (var participant in pending)
+        {
+            lines.Add($"   ⏳ {FormatTelegramParticipant(participant)}");
+        }
+
+        lines.Add(string.Empty);
+
+        if (request.Participants.Count > 0 && confirmed.Count == request.Participants.Count)
+        {
+            lines.Add($"Статус: ✅ все подтвердили ({confirmed.Count}/{request.Participants.Count})");
+        }
+        else if (declined.Count > 0)
+        {
+            lines.Add($"Статус: ⚠️ есть отказы ({confirmed.Count}/{request.Participants.Count} подтвердили)");
+        }
+        else
+        {
+            lines.Add($"Статус: ожидаем подтверждения ({confirmed.Count}/{request.Participants.Count})");
+        }
+
+        return string.Join("\n", lines);
+    }
+
+    private static string BuildJoinLinkText(PlatformJoinLinkNotification notification)
+    {
+        var mentions = string.Join(", ", notification.ConfirmedPlayers.Select(FormatTelegramParticipant));
+
+        return $"""
+            🎮 Игра «{notification.Title}» начинается через 5 минут!
+
+            🔗 Ссылка на подключение:
+            {notification.JoinLink}
+
+            Участники: {mentions}
+
+            Хорошей игры! 🎲
+            """;
+    }
+
+    private static string BuildDirectNotificationText(PlatformDirectSessionNotification notification) =>
+        notification.Kind switch
+        {
+            PlatformDirectSessionNotificationKind.ConfirmationRequest => $"""
+                🎲 <b>Подтвердите участие в игре</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(notification.Title)}</b>
+                📅 {notification.ScheduledAt.FormatMoscow()} (МСК)
+
+                Ответьте кнопкой в групповом сообщении расписания.
+                """,
+            PlatformDirectSessionNotificationKind.OneHourReminder => $"""
+                ⏰ <b>Игра начнётся примерно через 1 час</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(notification.Title)}</b>
+                📅 {notification.ScheduledAt.FormatMoscow()} (МСК)
+                🔗 {System.Net.WebUtility.HtmlEncode(notification.JoinLink ?? string.Empty)}
+                """,
+            PlatformDirectSessionNotificationKind.JoinLink => $"""
+                🎮 <b>Игра начинается через 5 минут</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(notification.Title)}</b>
+                🔗 {System.Net.WebUtility.HtmlEncode(notification.JoinLink ?? string.Empty)}
+                """,
+            PlatformDirectSessionNotificationKind.RescheduleApproved => $"""
+                ✅ <b>Сессия перенесена по итогам голосования</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(notification.Title)}</b>
+                📅 Новое время: <b>{notification.ScheduledAt.FormatMoscow()}</b> (МСК)
+                """,
+            PlatformDirectSessionNotificationKind.RescheduleRejected => $"""
+                ❌ <b>Перенос сессии отклонён по итогам голосования</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(notification.Title)}</b>
+                📅 Время остаётся прежним: <b>{notification.ScheduledAt.FormatMoscow()}</b> (МСК)
+                Причина: {System.Net.WebUtility.HtmlEncode(notification.Reason ?? string.Empty)}
+                """,
+            _ => BuildFallbackDirectText(notification)
+        };
+
+    private static string BuildFallbackDirectText(PlatformDirectSessionNotification notification) =>
+        $"<b>{System.Net.WebUtility.HtmlEncode(notification.Title)}</b>\n{notification.ScheduledAt.FormatMoscow()} (МСК)";
+
+    private static string BuildRsvpOutcomeDirectText(PlatformRsvpOutcomeNotification notification) =>
+        notification.Kind switch
+        {
+            PlatformRsvpOutcomeKind.GmAllConfirmed =>
+                $"✅ Все подтвердили участие в «{System.Net.WebUtility.HtmlEncode(notification.Title)}» ({notification.ScheduledAt.FormatMoscow()} МСК).",
+            PlatformRsvpOutcomeKind.GmPlayerDeclined =>
+                $"🚨 Отмена! {System.Net.WebUtility.HtmlEncode(notification.ActorDisplayName ?? "Игрок")} не сможет прийти на игру «{System.Net.WebUtility.HtmlEncode(notification.Title)}».",
+            _ => System.Net.WebUtility.HtmlEncode(notification.Title)
+        };
+
+    private static InlineKeyboardMarkup BuildRsvpKeyboard(Guid sessionId) =>
+        new([
+            [
+                InlineKeyboardButton.WithCallbackData("✅ Буду", $"rsvp:confirm:{sessionId}"),
+                InlineKeyboardButton.WithCallbackData("❌ Не смогу", $"rsvp:decline:{sessionId}")
+            ]
+        ]);
+
+    private static string FormatTelegramParticipant(PlatformSessionParticipant participant) =>
+        participant.User.ExternalUsername is not null
+            ? $"@{participant.User.ExternalUsername}"
+            : System.Net.WebUtility.HtmlEncode(participant.User.DisplayName);
+
     private async Task TrySendScheduleImageOnly(
         long chatId,
         int? threadId,

src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs

@@ -1,8 +1,8 @@
 // ... UpdateRouter will have CancelSessionHandler and cancel_session route instead of close_recruitment
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Features.Confirmation.HandleRsvp;
 using GmRelay.Shared.Features.Sessions.CreateSession;
 using GmRelay.Shared.Rendering;
-using GmRelay.Bot.Features.Confirmation.HandleRsvp;
 using GmRelay.Bot.Features.Sessions.CreateSession;
 using GmRelay.Bot.Features.Sessions.ListSessions;
 using GmRelay.Bot.Features.Sessions.ExportCalendar;
@@ -187,11 +187,11 @@ public sealed class UpdateRouter(
 
             var command = new HandleRsvpCommand(
                 SessionId: sessionId,
-                TelegramUserId: query.From.Id,
+                User: user,
                 Status: status,
-                CallbackQueryId: query.Id,
-                ChatId: message.Chat.Id,
-                MessageId: message.MessageId);
+                InteractionId: query.Id,
+                Group: group,
+                ConfirmationMessage: scheduleMessage);
 
             await rsvpHandler.HandleAsync(command, ct);
         }