feat: add multi-option reschedule voting

.gitea/workflows/deploy.yml

@@ -6,7 +6,7 @@ on:
       - main 
 
 env:
-  VERSION: 1.6.0
+  VERSION: 1.7.0
 
 jobs:
   # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.6.0</Version>
+    <Version>1.7.0</Version>
     <TargetFramework>net10.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>

README.md

@@ -4,7 +4,7 @@
 
 Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
 
-**Текущая версия:** `v1.6.0`.
+**Текущая версия:** `v1.7.0`.
 
 ---
 
@@ -16,6 +16,7 @@
 - **👥 Лимит мест и лист ожидания**: ГМ задаёт максимальный состав, бот не переполняет сессию, автоматически ведёт очередь ожидания и освобождённое место отдаёт первому ожидающему.
 - **📁 Поддержка Форумов (Telegram Topics)**: Бот автоматически создает тему во вложенных чатах Telegram под каждую новую пачку игр.
 - **❌ Управление сессиями**: Owner и назначенные co-GM могут создавать, отменять, удалять и переносить игры прямо из Telegram.
+- **🔄 Голосование за перенос**: При переносе сессии GM предлагает 2-3 новых времени и дедлайн, игроки голосуют кнопками, а бот показывает текущие результаты и применяет победивший вариант.
 - **🔔 Персональные уведомления**: Игроки получают DM о RSVP за 24 часа, напоминание за 1 час, ссылку перед игрой, отмены и переносы; групповые уведомления при этом остаются.
 - **🗓 Экспорт в Календарь**: Генерация файла `.ics` для добавления всех игр в Google, Apple или Яндекс Календарь одной командой.
 - **🚀 Native AOT**: Скомпилирован в нативный бинарный файл. Мгновенный запуск и минимальное потребление памяти. Идеально для **Raspberry Pi**.
@@ -129,6 +130,17 @@ docker compose up -d
 ### Делегирование управления
 На странице группы Web Dashboard показывает owner и список co-GM. Owner может добавить помощника по Telegram ID, имени и username, а также снять роль co-GM. Назначенный co-GM видит группу в панели управления и может редактировать сессии, управлять batch-операциями, очередью, переносами и удалением игр, но не может назначать других co-GM.
 
+### Перенос сессии голосованием
+Owner или co-GM нажимает кнопку `⏰ Перенести` у нужной сессии и отправляет в чат 2-3 варианта нового времени вместе с дедлайном:
+
+```text
+25.04.2026 19:30
+26.04.2026 18:00
+Дедлайн: 25.04.2026 12:00
+```
+
+Дедлайн должен быть в будущем и раньше первого предложенного времени. Участники выбирают один вариант кнопкой в Telegram, могут изменить голос до дедлайна и видят текущие результаты в сообщении голосования. По дедлайну бот выбирает вариант с наибольшим числом голосов, переносит сессию, сбрасывает RSVP и обновляет batch-сообщение. Если голосов нет или есть ничья, перенос отклоняется, а время сессии остаётся прежним.
+
 ### Bulk-операции в Web Dashboard
 На странице группы Web Dashboard показывает отдельный блок для каждой пачки игр. Owner и co-GM могут:
 - обновить общий `title` и `link` сразу у всех сессий batch;
@@ -142,7 +154,7 @@ docker compose up -d
 
 ### Другие команды
 - `/listsessions` — Показать список всех актуальных игр в этой группе.
-- `/reschedulesession` — Перенести сессию на другое время с голосованием игроков.
+- `⏰ Перенести` в сообщении расписания — Запустить голосование по 2-3 вариантам нового времени.
 - `/deletesession` — Удалить сессию.
 - `/exportcalendar` — Получить `.ics` файл с играми.
 - `/help` — Справка по формату.

compose.yaml

@@ -17,7 +17,7 @@ services:
       retries: 10
 
   bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:1.6.0
+    image: git.codeanddice.ru/toutsu/gmrelay-bot:1.7.0
     restart: always
     depends_on:
       db:
@@ -29,7 +29,7 @@ services:
       - gmrelay
 
   web:
-    image: git.codeanddice.ru/toutsu/gmrelay-web:1.6.0
+    image: git.codeanddice.ru/toutsu/gmrelay-web:1.7.0
     restart: always
     depends_on:
       db:

src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs

@@ -25,7 +25,8 @@ internal sealed record VoteParticipantDto(
 
 /// <summary>
 /// Handles text input from the GM who has an AwaitingTime proposal.
-/// Parses the new time, creates a voting message, and tags all participants.
+/// Parses reschedule options with a voting deadline, creates a voting message,
+/// and tags all participants.
 /// If no participants are registered, reschedules immediately.
 /// </summary>
 public sealed class HandleRescheduleTimeInputHandler(
@@ -77,26 +78,17 @@ public sealed class HandleRescheduleTimeInputHandler(
         if (proposal is null)
             return false;
 
-        // 2. Parse the new time
+        // 2. Parse voting input
-        if (!MoscowTime.TryParseMoscow(text, out var newTime))
+        if (!RescheduleVotingInput.TryParse(text, DateTimeOffset.UtcNow, out var votingInput, out var parseError))
         {
             await bot.SendMessage(
                 chatId: chatId,
-                text: "⚠️ Не удалось распознать время. Используйте формат: <code>ДД.ММ.ГГГГ ЧЧ:ММ</code>\nНапример: <code>25.04.2026 19:30</code>",
+                text: $"⚠️ {parseError}\n\nИспользуйте формат:\n<code>25.04.2026 19:30\n26.04.2026 18:00\nДедлайн: 25.04.2026 12:00</code>",
                 parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
                 cancellationToken: ct);
             return true;
         }
 
-        if (newTime <= DateTimeOffset.UtcNow)
-        {
-            await bot.SendMessage(
-                chatId: chatId,
-                text: "⚠️ Новое время должно быть в будущем. Попробуйте снова.",
-                cancellationToken: ct);
-            return true;
-        }
-
         // 3. Load participants (non-GM) signed up for this session
         var participants = (await connection.QueryAsync<VoteParticipantDto>(
             """
@@ -115,35 +107,56 @@ public sealed class HandleRescheduleTimeInputHandler(
         // 4. If no participants — reschedule immediately
         if (participants.Count == 0)
         {
-            await RescheduleImmediately(connection, proposal, newTime, chatId, ct);
+            await RescheduleImmediately(connection, proposal, votingInput.Options[0], chatId, ct);
             await TryDeleteMessage(chatId, message.MessageId, ct);
             return true;
         }
 
         // 5. Create voting message
         await using var transaction = await connection.BeginTransactionAsync(ct);
+        var options = votingInput.Options
+            .Select((proposedAt, index) => new RescheduleOptionDto(
+                Guid.NewGuid(),
+                index + 1,
+                proposedAt))
+            .ToList();
 
-        // Update proposal with proposed time and Voting status
         await connection.ExecuteAsync(
             """
             UPDATE reschedule_proposals
-            SET proposed_at = @ProposedAt, status = 'Voting', vote_chat_id = @ChatId
+            SET voting_deadline_at = @Deadline, status = 'Voting', vote_chat_id = @ChatId
             WHERE id = @Id
             """,
-            new { ProposedAt = newTime, ChatId = chatId, Id = proposal.Id },
+            new { votingInput.Deadline, ChatId = chatId, Id = proposal.Id },
             transaction);
 
+        foreach (var option in options)
+        {
+            await connection.ExecuteAsync(
+                """
+                INSERT INTO reschedule_options (id, proposal_id, proposed_at, display_order)
+                VALUES (@OptionId, @ProposalId, @ProposedAt, @DisplayOrder)
+                """,
+                new
+                {
+                    option.OptionId,
+                    ProposalId = proposal.Id,
+                    option.ProposedAt,
+                    option.DisplayOrder
+                },
+                transaction);
+        }
+
         await transaction.CommitAsync(ct);
 
-        // Build voting message text
+        var voteText = BuildVotingMessage(
-        var voteText = BuildVotingMessage(proposal.Title, proposal.CurrentScheduledAt, newTime, participants, []);
+            proposal.Title,
-        
+            proposal.CurrentScheduledAt,
-        var keyboard = new InlineKeyboardMarkup([
+            votingInput.Deadline,
-            [
+            options,
-                InlineKeyboardButton.WithCallbackData("✅ Согласен", $"reschedule_vote:yes:{proposal.Id}"),
+            participants,
-                InlineKeyboardButton.WithCallbackData("❌ Против", $"reschedule_vote:no:{proposal.Id}")
+            []);
-            ]
+        var keyboard = BuildVotingKeyboard(options);
-        ]);
 
         var voteMsg = await bot.SendMessage(
             chatId: chatId,
@@ -155,12 +168,18 @@ public sealed class HandleRescheduleTimeInputHandler(
         var mode = SessionNotificationModeExtensions.FromDatabaseValue(proposal.NotificationMode);
         if (mode.ShouldSendDirectMessages())
         {
+            var optionsText = string.Join(
+                "\n",
+                options.Select(option => $"{option.DisplayOrder}. <b>{option.ProposedAt.FormatMoscow()}</b> (МСК)"));
             var directText = $"""
                 🔄 <b>Голосование за перенос сессии</b>
 
                 📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>
                 📅 Текущее время: <b>{proposal.CurrentScheduledAt.FormatMoscow()}</b> (МСК)
-                📅 Новое время: <b>{newTime.FormatMoscow()}</b> (МСК)
+                🗳 Варианты:
+                {optionsText}
+
+                ⏳ Дедлайн: <b>{votingInput.Deadline.FormatMoscow()}</b> (МСК)
 
                 Проголосуйте кнопкой в групповом сообщении.
                 """;
@@ -180,7 +199,12 @@ public sealed class HandleRescheduleTimeInputHandler(
             "UPDATE reschedule_proposals SET vote_message_id = @MsgId WHERE id = @Id",
             new { MsgId = voteMsg.MessageId, Id = proposal.Id });
 
-        logger.LogInformation("Reschedule voting started for session {SessionId}, proposal {ProposalId}", proposal.SessionId, proposal.Id);
+        logger.LogInformation(
+            "Reschedule voting started for session {SessionId}, proposal {ProposalId}, options {OptionCount}, deadline {Deadline}",
+            proposal.SessionId,
+            proposal.Id,
+            options.Count,
+            votingInput.Deadline);
 
         // Delete GM's time input message
         await TryDeleteMessage(chatId, message.MessageId, ct);
@@ -226,33 +250,105 @@ public sealed class HandleRescheduleTimeInputHandler(
     }
 
     internal static string BuildVotingMessage(
-        string title, DateTime currentTime, DateTimeOffset newTime,
+        string title,
+        DateTime currentTime,
+        DateTimeOffset deadline,
+        IReadOnlyList<RescheduleOptionDto> options,
         IReadOnlyList<VoteParticipantDto> participants,
-        IReadOnlyCollection<Guid> approvedPlayerIds)
+        IReadOnlyList<RescheduleOptionVoteDto> votes)
     {
+        var votesByOption = votes
+            .GroupBy(v => v.OptionId)
+            .ToDictionary(g => g.Key, g => g.ToList());
+        var votedPlayerIds = votes.Select(v => v.PlayerId).ToHashSet();
+        var pendingParticipants = participants
+            .Where(p => !votedPlayerIds.Contains(p.PlayerId))
+            .Select(FormatParticipantName)
+            .ToList();
+
         var lines = new List<string>
         {
             $"🔄 <b>Перенос сессии «{System.Net.WebUtility.HtmlEncode(title)}»</b>",
             "",
             $"📅 Текущее время: <b>{currentTime.FormatMoscow()}</b> (МСК)",
-            $"📅 Новое время: <b>{newTime.ToOffset(TimeSpan.FromHours(3)).ToString("d MMMM yyyy, HH:mm", System.Globalization.CultureInfo.GetCultureInfo("ru-RU"))}</b> (МСК)",
+            $"⏳ Дедлайн: <b>{deadline.FormatMoscow()}</b> (МСК)",
             "",
-            "Для переноса нужно согласие всех участников:"
+            "Выберите один из вариантов:"
         };
 
-        foreach (var p in participants)
+        foreach (var option in options.OrderBy(x => x.DisplayOrder))
         {
-            var name = p.TelegramUsername is not null ? $"@{p.TelegramUsername}" : p.DisplayName;
+            var optionVotes = votesByOption.GetValueOrDefault(option.OptionId, []);
-            var icon = approvedPlayerIds.Contains(p.PlayerId) ? "✅" : "⏳";
+            lines.Add(
-            lines.Add($"   {icon} {name}");
+                $"{option.DisplayOrder}. <b>{option.ProposedAt.FormatMoscow()}</b> (МСК) — {FormatVoteCount(optionVotes.Count)}");
+
+            if (optionVotes.Count > 0)
+            {
+                lines.Add($"   {string.Join(", ", optionVotes.Select(FormatParticipantName))}");
+            }
+        }
+
+        if (pendingParticipants.Count > 0)
+        {
+            lines.Add("");
+            lines.Add($"Не проголосовали: {string.Join(", ", pendingParticipants)}");
         }
 
         lines.Add("");
-        lines.Add($"Голоса: {approvedPlayerIds.Count}/{participants.Count} ✅");
+        lines.Add($"Голосов: {votedPlayerIds.Count}/{participants.Count}");
+        lines.Add("Правило: побеждает вариант с большинством голосов к дедлайну; при ничьей перенос не применяется.");
 
         return string.Join("\n", lines);
     }
 
+    internal static InlineKeyboardMarkup BuildVotingKeyboard(IReadOnlyList<RescheduleOptionDto> options)
+    {
+        return new InlineKeyboardMarkup(
+            options
+                .OrderBy(option => option.DisplayOrder)
+                .Select(option => new[]
+                {
+                    InlineKeyboardButton.WithCallbackData(
+                        $"{option.DisplayOrder}. {FormatButtonTime(option.ProposedAt)}",
+                        $"reschedule_vote:{option.OptionId}")
+                }));
+    }
+
+    internal static string FormatParticipantName(VoteParticipantDto participant)
+    {
+        return participant.TelegramUsername is { Length: > 0 } username
+            ? $"@{System.Net.WebUtility.HtmlEncode(username)}"
+            : System.Net.WebUtility.HtmlEncode(participant.DisplayName);
+    }
+
+    internal static string FormatParticipantName(RescheduleOptionVoteDto vote)
+    {
+        return vote.TelegramUsername is { Length: > 0 } username
+            ? $"@{System.Net.WebUtility.HtmlEncode(username)}"
+            : System.Net.WebUtility.HtmlEncode(vote.DisplayName);
+    }
+
+    private static string FormatVoteCount(int count)
+    {
+        var modulo100 = count % 100;
+        var modulo10 = count % 10;
+        var word = modulo100 is >= 11 and <= 14
+            ? "голосов"
+            : modulo10 switch
+            {
+                1 => "голос",
+                >= 2 and <= 4 => "голоса",
+                _ => "голосов"
+            };
+
+        return $"{count} {word}";
+    }
+
+    private static string FormatButtonTime(DateTimeOffset utc)
+        => utc.ToOffset(TimeSpan.FromHours(3)).ToString(
+            "dd.MM HH:mm",
+            System.Globalization.CultureInfo.InvariantCulture);
+
     private async Task TryUpdateBatchMessage(AwaitingProposalDto proposal, CancellationToken ct)
     {
         try

src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleVoteHandler.cs

@@ -1,16 +1,12 @@
 using Dapper;
-using GmRelay.Bot.Features.Notifications;
 using GmRelay.Shared.Domain;
-using GmRelay.Shared.Rendering;
 using Npgsql;
 using Telegram.Bot;
-using Telegram.Bot.Types.ReplyMarkups;
 
 namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
 
 public sealed record HandleRescheduleVoteCommand(
-    Guid ProposalId,
+    Guid OptionId,
-    string Vote,
     long TelegramUserId,
     string CallbackQueryId,
     long ChatId,
@@ -19,20 +15,13 @@ public sealed record HandleRescheduleVoteCommand(
 internal sealed record VoteProposalDto(
     Guid Id,
     Guid SessionId,
-    DateTime ProposedAt,
+    DateTimeOffset VotingDeadlineAt,
     string Title,
-    DateTime CurrentScheduledAt,
+    DateTime CurrentScheduledAt);
-    Guid BatchId,
-    string SessionStatus,
-    long TelegramChatId,
-    int? ConfirmationMessageId,
-    int? BatchMessageId,
-    string NotificationMode);
 
 public sealed class HandleRescheduleVoteHandler(
     NpgsqlDataSource dataSource,
     ITelegramBotClient bot,
-    DirectSessionNotificationSender directSender,
     ILogger<HandleRescheduleVoteHandler> logger)
 {
     public async Task HandleAsync(HandleRescheduleVoteCommand command, CancellationToken ct)
@@ -44,21 +33,15 @@ public sealed class HandleRescheduleVoteHandler(
             """
             SELECT rp.id AS Id,
                    rp.session_id AS SessionId,
-                   rp.proposed_at AS ProposedAt,
+                   rp.voting_deadline_at AS VotingDeadlineAt,
                    s.title AS Title,
-                   s.scheduled_at AS CurrentScheduledAt,
+                   s.scheduled_at AS CurrentScheduledAt
-                   s.batch_id AS BatchId,
+            FROM reschedule_options ro
-                   s.status AS SessionStatus,
+            JOIN reschedule_proposals rp ON rp.id = ro.proposal_id
-                   s.confirmation_message_id AS ConfirmationMessageId,
-                   s.batch_message_id AS BatchMessageId,
-                   g.telegram_chat_id AS TelegramChatId,
-                   s.notification_mode AS NotificationMode
-            FROM reschedule_proposals rp
             JOIN sessions s ON s.id = rp.session_id
-            JOIN game_groups g ON g.id = s.group_id
+            WHERE ro.id = @OptionId AND rp.status = 'Voting'
-            WHERE rp.id = @ProposalId AND rp.status = 'Voting'
             """,
-            new { command.ProposalId },
+            new { command.OptionId },
             transaction);
 
         if (proposal is null)
@@ -70,6 +53,16 @@ public sealed class HandleRescheduleVoteHandler(
             return;
         }
 
+        if (proposal.VotingDeadlineAt <= DateTimeOffset.UtcNow)
+        {
+            await bot.AnswerCallbackQuery(
+                command.CallbackQueryId,
+                "Дедлайн уже прошёл. Результаты скоро будут применены.",
+                showAlert: true,
+                cancellationToken: ct);
+            return;
+        }
+
         var playerId = await connection.ExecuteScalarAsync<Guid?>(
             """
             SELECT p.id
@@ -94,18 +87,21 @@ public sealed class HandleRescheduleVoteHandler(
 
         await connection.ExecuteAsync(
             """
-            INSERT INTO reschedule_votes (proposal_id, player_id, vote)
+            INSERT INTO reschedule_option_votes (proposal_id, player_id, option_id)
-            VALUES (@ProposalId, @PlayerId, @Vote)
+            VALUES (@ProposalId, @PlayerId, @OptionId)
             ON CONFLICT (proposal_id, player_id) DO UPDATE
-            SET vote = EXCLUDED.vote,
+            SET option_id = EXCLUDED.option_id,
                 voted_at = now()
             """,
-            new { command.ProposalId, PlayerId = playerId.Value, command.Vote },
+            new
+            {
+                ProposalId = proposal.Id,
+                PlayerId = playerId.Value,
+                command.OptionId
+            },
             transaction);
 
-        var participants = command.Vote.Equals("no", StringComparison.OrdinalIgnoreCase)
+        var participants = (await connection.QueryAsync<VoteParticipantDto>(
-            ? new List<VoteParticipantDto>()
-            : (await connection.QueryAsync<VoteParticipantDto>(
             """
             SELECT p.id AS PlayerId,
                    p.display_name AS DisplayName,
@@ -116,159 +112,47 @@ public sealed class HandleRescheduleVoteHandler(
             WHERE sp.session_id = @SessionId
               AND sp.is_gm = false
               AND sp.registration_status = @Active
+            ORDER BY p.display_name
             """,
             new { proposal.SessionId, Active = ParticipantRegistrationStatus.Active },
             transaction)).ToList();
 
-        var approvedPlayerIds = command.Vote.Equals("no", StringComparison.OrdinalIgnoreCase)
+        var options = (await connection.QueryAsync<RescheduleOptionDto>(
-            ? new HashSet<Guid>()
-            : (await connection.QueryAsync<Guid>(
             """
-                SELECT player_id
+            SELECT id AS OptionId,
-                FROM reschedule_votes
+                   display_order AS DisplayOrder,
-                WHERE proposal_id = @ProposalId AND vote = 'yes'
+                   proposed_at AS ProposedAt
+            FROM reschedule_options
+            WHERE proposal_id = @ProposalId
+            ORDER BY display_order
             """,
-                new { command.ProposalId },
+            new { ProposalId = proposal.Id },
-                transaction)).ToHashSet();
+            transaction)).ToList();
 
-        var decision = RescheduleVoteRules.Evaluate(command.Vote, participants.Count, approvedPlayerIds.Count);
+        var votes = (await connection.QueryAsync<RescheduleOptionVoteDto>(
-
-        if (decision.Outcome == RescheduleVoteOutcome.Rejected)
-        {
-            var directRecipients = await LoadDirectRecipients(connection, proposal.SessionId, transaction);
-
-            await connection.ExecuteAsync(
-                "UPDATE reschedule_proposals SET status = 'Rejected' WHERE id = @Id",
-                new { Id = command.ProposalId },
-                transaction);
-
-            await transaction.CommitAsync(ct);
-
-            var voterName = await connection.QuerySingleOrDefaultAsync<string>(
-                "SELECT display_name FROM players WHERE telegram_id = @TelegramUserId",
-                new { command.TelegramUserId });
-
-            try
-            {
-                await bot.EditMessageText(
-                    chatId: command.ChatId,
-                    messageId: command.MessageId,
-                    text: $"❌ <b>Перенос сессии «{System.Net.WebUtility.HtmlEncode(proposal.Title)}» отклонён!</b>\n\n{voterName ?? "Участник"} проголосовал(а) против. Время сессии остаётся прежним:\n📅 <b>{proposal.CurrentScheduledAt.FormatMoscow()}</b> (МСК)",
-                    parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-                    cancellationToken: ct);
-            }
-            catch (Exception ex)
-            {
-                logger.LogWarning(ex, "Failed to update vote message after rejection");
-            }
-
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, decision.CallbackText, cancellationToken: ct);
-
-            var mode = SessionNotificationModeExtensions.FromDatabaseValue(proposal.NotificationMode);
-            if (mode.ShouldSendDirectMessages())
-            {
-                await directSender.SendAsync(
-                    directRecipients,
-                    $"❌ <b>Перенос сессии отклонён</b>\n\n📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>\n📅 Время остаётся прежним: <b>{proposal.CurrentScheduledAt.FormatMoscow()}</b> (МСК)",
-                    "reschedule-rejected",
-                    proposal.SessionId,
-                    ct);
-            }
-
-            logger.LogInformation("Reschedule proposal {ProposalId} rejected by player {PlayerId}", command.ProposalId, playerId);
-            return;
-        }
-
-        if (decision.ShouldRescheduleSession)
-        {
-            var directRecipients = await LoadDirectRecipients(connection, proposal.SessionId, transaction);
-            var newTime = new DateTimeOffset(proposal.ProposedAt, TimeSpan.Zero);
-
-            await connection.ExecuteAsync(
             """
-                UPDATE sessions
+            SELECT rov.option_id AS OptionId,
-                SET scheduled_at = @NewTime,
+                   p.id AS PlayerId,
-                    status = @Status,
+                   p.display_name AS DisplayName,
-                    confirmation_message_id = NULL,
+                   p.telegram_username AS TelegramUsername
-                    link_message_id = NULL,
+            FROM reschedule_option_votes rov
-                    one_hour_reminder_processed_at = NULL,
+            JOIN players p ON p.id = rov.player_id
-                    updated_at = now()
+            WHERE rov.proposal_id = @ProposalId
-                WHERE id = @SessionId
+            ORDER BY rov.voted_at, p.display_name
             """,
-                new { NewTime = newTime, proposal.SessionId, Status = SessionStatus.Planned },
+            new { ProposalId = proposal.Id },
-                transaction);
+            transaction)).ToList();
 
-            await connection.ExecuteAsync(
-                "UPDATE reschedule_proposals SET status = 'Approved' WHERE id = @Id",
-                new { Id = command.ProposalId },
-                transaction);
-
-            if (decision.ShouldResetParticipantRsvps)
-            {
-                await connection.ExecuteAsync(
-                    """
-                    UPDATE session_participants
-                    SET rsvp_status = 'Pending',
-                        responded_at = NULL
-                    WHERE session_id = @SessionId AND is_gm = false
-                      AND registration_status = @Active
-                    """,
-                    new { proposal.SessionId, Active = ParticipantRegistrationStatus.Active },
-                    transaction);
-            }
-
-            await transaction.CommitAsync(ct);
-
-            try
-            {
-                await bot.EditMessageText(
-                    chatId: command.ChatId,
-                    messageId: command.MessageId,
-                    text: $"✅ <b>Перенос сессии «{System.Net.WebUtility.HtmlEncode(proposal.Title)}» одобрен!</b>\n\nВсе участники согласились.\n📅 Новое время: <b>{proposal.ProposedAt.FormatMoscow()}</b> (МСК)\n\n<i>Уведомления будут приходить согласно новому расписанию.</i>",
-                    parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-                    cancellationToken: ct);
-            }
-            catch (Exception ex)
-            {
-                logger.LogWarning(ex, "Failed to update vote message after approval");
-            }
-
-            await TryUpdateBatchMessage(proposal, ct);
-
-            var mode = SessionNotificationModeExtensions.FromDatabaseValue(proposal.NotificationMode);
-            if (mode.ShouldSendDirectMessages())
-            {
-                await directSender.SendAsync(
-                    directRecipients,
-                    $"✅ <b>Сессия перенесена</b>\n\n📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>\n📅 Новое время: <b>{proposal.ProposedAt.FormatMoscow()}</b> (МСК)",
-                    "reschedule-approved",
-                    proposal.SessionId,
-                    ct);
-            }
-
-            logger.LogInformation(
-                "Session {SessionId} rescheduled to {NewTime} (proposal {ProposalId})",
-                proposal.SessionId,
-                newTime,
-                command.ProposalId);
-        }
-        else
-        {
         await transaction.CommitAsync(ct);
 
         var voteText = HandleRescheduleTimeInputHandler.BuildVotingMessage(
             proposal.Title,
             proposal.CurrentScheduledAt,
-                new DateTimeOffset(proposal.ProposedAt, TimeSpan.Zero),
+            proposal.VotingDeadlineAt,
+            options,
             participants,
-                approvedPlayerIds);
+            votes);
-
+        var keyboard = HandleRescheduleTimeInputHandler.BuildVotingKeyboard(options);
-            var keyboard = new InlineKeyboardMarkup([
-                [
-                    InlineKeyboardButton.WithCallbackData("✅ Согласен", $"reschedule_vote:yes:{command.ProposalId}"),
-                    InlineKeyboardButton.WithCallbackData("❌ Против", $"reschedule_vote:no:{command.ProposalId}")
-                ]
-            ]);
 
         try
         {
@@ -282,80 +166,12 @@ public sealed class HandleRescheduleVoteHandler(
         }
         catch (Exception ex)
         {
-                logger.LogWarning(ex, "Failed to update vote message with progress");
+            logger.LogWarning(ex, "Failed to update reschedule vote message for proposal {ProposalId}", proposal.Id);
-            }
         }
 
-        await bot.AnswerCallbackQuery(command.CallbackQueryId, decision.CallbackText, cancellationToken: ct);
+        await bot.AnswerCallbackQuery(
-    }
+            command.CallbackQueryId,
-
+            "Ваш голос учтён. До дедлайна его можно изменить.",
-    private static async Task<List<DirectNotificationRecipient>> LoadDirectRecipients(
-        Npgsql.NpgsqlConnection connection,
-        Guid sessionId,
-        Npgsql.NpgsqlTransaction transaction)
-    {
-        return (await connection.QueryAsync<DirectNotificationRecipient>(
-            """
-            SELECT p.telegram_id AS TelegramId,
-                   p.display_name AS DisplayName
-            FROM session_participants sp
-            JOIN players p ON p.id = sp.player_id
-            WHERE sp.session_id = @SessionId
-              AND sp.is_gm = false
-              AND sp.registration_status = @Active
-            """,
-            new { SessionId = sessionId, Active = ParticipantRegistrationStatus.Active },
-            transaction)).ToList();
-    }
-
-    private async Task TryUpdateBatchMessage(VoteProposalDto proposal, CancellationToken ct)
-    {
-        try
-        {
-            await using var connection = await dataSource.OpenConnectionAsync(ct);
-
-            var batchSessions = (await connection.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
-                new { proposal.BatchId })).ToList();
-
-            var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(
-                """
-                SELECT sp.session_id AS SessionId,
-                       p.display_name AS DisplayName,
-                       p.telegram_username AS TelegramUsername,
-                       sp.registration_status AS RegistrationStatus
-                FROM session_participants sp
-                JOIN players p ON sp.player_id = p.id
-                JOIN sessions s ON sp.session_id = s.id
-                WHERE s.batch_id = @BatchId AND sp.is_gm = false
-                ORDER BY sp.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC
-                """,
-                new { proposal.BatchId })).ToList();
-
-            if (proposal.BatchMessageId.HasValue)
-            {
-                var renderResult = SessionBatchRenderer.Render(proposal.Title, batchSessions, batchParticipants);
-
-                await bot.EditMessageText(
-                    chatId: proposal.TelegramChatId,
-                    messageId: proposal.BatchMessageId.Value,
-                    text: renderResult.Text,
-                    parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-                    replyMarkup: renderResult.Markup,
             cancellationToken: ct);
     }
-            else
-            {
-                await bot.SendMessage(
-                    chatId: proposal.TelegramChatId,
-                    text: $"📣 Расписание обновлено! Сессия «{proposal.Title}» перенесена на <b>{proposal.ProposedAt.FormatMoscow()}</b> (МСК).",
-                    parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-                    cancellationToken: ct);
-            }
-        }
-        catch (Exception ex)
-        {
-            logger.LogWarning(ex, "Failed to update batch message for proposal {ProposalId}", proposal.Id);
-        }
-    }
 }

src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs

@@ -23,7 +23,7 @@ internal sealed record RescheduleSessionInfoDto(string Title, bool CanManage);
 /// <summary>
 /// Handles the "⏰ Перенести" button press from the batch message.
 /// Creates a reschedule proposal in AwaitingTime status and prompts
-/// the GM to enter the new time via a regular text message.
+/// the GM to enter 2-3 new time options and a voting deadline.
 /// </summary>
 public sealed class InitiateRescheduleHandler(
     NpgsqlDataSource dataSource,
@@ -92,11 +92,20 @@ public sealed class InitiateRescheduleHandler(
 
         // 4. Prompt GM in chat
         await bot.AnswerCallbackQuery(command.CallbackQueryId,
-            "Введите новое время в чат (формат: ДД.ММ.ГГГГ ЧЧ:ММ)", cancellationToken: ct);
+            "Введите 2-3 варианта времени и дедлайн голосования.", cancellationToken: ct);
 
         await bot.SendMessage(
             chatId: command.ChatId,
-            text: $"⏰ Укажите новое время для сессии «{session.Title}» в формате:\n<code>ДД.ММ.ГГГГ ЧЧ:ММ</code>\n\nНапример: <code>25.04.2026 19:30</code>",
+            text: $"""
+                ⏰ Укажите 2-3 варианта времени для сессии «{session.Title}» и дедлайн голосования.
+
+                Формат:
+                <code>25.04.2026 19:30
+                26.04.2026 18:00
+                Дедлайн: 25.04.2026 12:00</code>
+
+                Дедлайн должен быть в будущем и раньше первого предложенного времени.
+                """,
             parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
             cancellationToken: ct);
     }

src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVoteRules.cs

@@ -9,27 +9,57 @@ internal enum RescheduleVoteOutcome
 
 internal sealed record RescheduleVoteDecision(
     RescheduleVoteOutcome Outcome,
-    string CallbackText,
+    string Reason,
-    bool ShouldRescheduleSession,
+    Guid? SelectedOptionId = null,
-    bool ShouldResetParticipantRsvps);
+    string CallbackText = "",
+    bool ShouldRescheduleSession = false,
+    bool ShouldResetParticipantRsvps = false);
 
 internal static class RescheduleVoteRules
 {
+    public static RescheduleVoteDecision SelectWinner(IReadOnlyList<RescheduleOptionVoteCount> voteCounts)
+    {
+        var maxVotes = voteCounts.Count == 0 ? 0 : voteCounts.Max(x => x.VoteCount);
+        if (maxVotes == 0)
+        {
+            return new RescheduleVoteDecision(
+                RescheduleVoteOutcome.Rejected,
+                "Никто не проголосовал до дедлайна, перенос не применяется.");
+        }
+
+        var winners = voteCounts.Where(x => x.VoteCount == maxVotes).ToList();
+        if (winners.Count > 1)
+        {
+            return new RescheduleVoteDecision(
+                RescheduleVoteOutcome.Rejected,
+                "Голоса разделились поровну, перенос не применяется.");
+        }
+
+        return new RescheduleVoteDecision(
+            RescheduleVoteOutcome.Approved,
+            "Победил вариант с большинством голосов.",
+            winners[0].OptionId,
+            ShouldRescheduleSession: true,
+            ShouldResetParticipantRsvps: true);
+    }
+
     public static RescheduleVoteDecision Evaluate(string vote, int totalParticipants, int approvedParticipants)
     {
         if (string.Equals(vote, "no", StringComparison.OrdinalIgnoreCase))
         {
             return new RescheduleVoteDecision(
                 Outcome: RescheduleVoteOutcome.Rejected,
-                CallbackText: "\u0412\u044b \u043f\u0440\u043e\u0433\u043e\u043b\u043e\u0441\u043e\u0432\u0430\u043b\u0438 \u043f\u0440\u043e\u0442\u0438\u0432 \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0430.",
+                Reason: "\u041e\u0434\u0438\u043d \u0438\u0437 \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u043e\u0432 \u043e\u0442\u043a\u043b\u043e\u043d\u0438\u043b \u043f\u0435\u0440\u0435\u043d\u043e\u0441.",
-                ShouldRescheduleSession: false,
+                CallbackText: "\u0412\u044b \u043f\u0440\u043e\u0433\u043e\u043b\u043e\u0441\u043e\u0432\u0430\u043b\u0438 \u043f\u0440\u043e\u0442\u0438\u0432 \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0430.");
-                ShouldResetParticipantRsvps: false);
         }
 
         var everyoneApproved = approvedParticipants == totalParticipants;
 
         return new RescheduleVoteDecision(
             Outcome: everyoneApproved ? RescheduleVoteOutcome.Approved : RescheduleVoteOutcome.Pending,
+            Reason: everyoneApproved
+                ? "\u0412\u0441\u0435 \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0438 \u0441\u043e\u0433\u043b\u0430\u0441\u043d\u044b."
+                : "\u0413\u043e\u043b\u043e\u0441\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0430\u0435\u0442\u0441\u044f.",
             CallbackText: everyoneApproved
                 ? "\u0412\u044b \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u043d\u043e\u0441! \u0412\u0441\u0435 \u0441\u043e\u0433\u043b\u0430\u0441\u043d\u044b \u2014 \u0432\u0440\u0435\u043c\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e."
                 : "\u0412\u044b \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u043d\u043e\u0441!",

src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs

@@ -0,0 +1,361 @@
+using Dapper;
+using GmRelay.Bot.Features.Notifications;
+using GmRelay.Shared.Domain;
+using GmRelay.Shared.Rendering;
+using Npgsql;
+using Telegram.Bot;
+using Telegram.Bot.Types.Enums;
+
+namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
+
+internal sealed record DueRescheduleProposalDto(
+    Guid Id,
+    Guid SessionId,
+    DateTimeOffset VotingDeadlineAt,
+    string Title,
+    DateTime CurrentScheduledAt,
+    Guid BatchId,
+    int? BatchMessageId,
+    int? VoteMessageId,
+    long TelegramChatId,
+    string NotificationMode);
+
+public sealed class RescheduleVotingDeadlineService(
+    NpgsqlDataSource dataSource,
+    ITelegramBotClient bot,
+    DirectSessionNotificationSender directSender,
+    ILogger<RescheduleVotingDeadlineService> logger) : BackgroundService
+{
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        try
+        {
+            await ProcessDueProposals(stoppingToken);
+
+            using var timer = new PeriodicTimer(TimeSpan.FromMinutes(1));
+            while (await timer.WaitForNextTickAsync(stoppingToken))
+            {
+                await ProcessDueProposals(stoppingToken);
+            }
+        }
+        catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
+        {
+        }
+    }
+
+    private async Task ProcessDueProposals(CancellationToken ct)
+    {
+        try
+        {
+            await using var connection = await dataSource.OpenConnectionAsync(ct);
+            var proposalIds = (await connection.QueryAsync<Guid>(
+                """
+                SELECT id
+                FROM reschedule_proposals
+                WHERE status = 'Voting'
+                  AND voting_deadline_at IS NOT NULL
+                  AND voting_deadline_at <= now()
+                ORDER BY voting_deadline_at
+                LIMIT 25
+                """)).ToList();
+
+            foreach (var proposalId in proposalIds)
+            {
+                await FinalizeProposal(proposalId, ct);
+            }
+        }
+        catch (OperationCanceledException) when (ct.IsCancellationRequested)
+        {
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Failed to process due reschedule voting proposals");
+        }
+    }
+
+    private async Task FinalizeProposal(Guid proposalId, CancellationToken ct)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync(ct);
+        await using var transaction = await connection.BeginTransactionAsync(ct);
+
+        var proposal = await connection.QuerySingleOrDefaultAsync<DueRescheduleProposalDto>(
+            """
+            SELECT rp.id AS Id,
+                   rp.session_id AS SessionId,
+                   rp.voting_deadline_at AS VotingDeadlineAt,
+                   rp.vote_message_id AS VoteMessageId,
+                   s.title AS Title,
+                   s.scheduled_at AS CurrentScheduledAt,
+                   s.batch_id AS BatchId,
+                   s.batch_message_id AS BatchMessageId,
+                   s.notification_mode AS NotificationMode,
+                   g.telegram_chat_id AS TelegramChatId
+            FROM reschedule_proposals rp
+            JOIN sessions s ON s.id = rp.session_id
+            JOIN game_groups g ON g.id = s.group_id
+            WHERE rp.id = @ProposalId
+              AND rp.status = 'Voting'
+              AND rp.voting_deadline_at IS NOT NULL
+              AND rp.voting_deadline_at <= now()
+            FOR UPDATE
+            """,
+            new { ProposalId = proposalId },
+            transaction);
+
+        if (proposal is null)
+            return;
+
+        var participants = (await connection.QueryAsync<VoteParticipantDto>(
+            """
+            SELECT p.id AS PlayerId,
+                   p.display_name AS DisplayName,
+                   p.telegram_username AS TelegramUsername,
+                   p.telegram_id AS TelegramId
+            FROM session_participants sp
+            JOIN players p ON p.id = sp.player_id
+            WHERE sp.session_id = @SessionId
+              AND sp.is_gm = false
+              AND sp.registration_status = @Active
+            ORDER BY p.display_name
+            """,
+            new { proposal.SessionId, Active = ParticipantRegistrationStatus.Active },
+            transaction)).ToList();
+
+        var options = (await connection.QueryAsync<RescheduleOptionDto>(
+            """
+            SELECT id AS OptionId,
+                   display_order AS DisplayOrder,
+                   proposed_at AS ProposedAt
+            FROM reschedule_options
+            WHERE proposal_id = @ProposalId
+            ORDER BY display_order
+            """,
+            new { ProposalId = proposal.Id },
+            transaction)).ToList();
+
+        var votes = (await connection.QueryAsync<RescheduleOptionVoteDto>(
+            """
+            SELECT rov.option_id AS OptionId,
+                   p.id AS PlayerId,
+                   p.display_name AS DisplayName,
+                   p.telegram_username AS TelegramUsername
+            FROM reschedule_option_votes rov
+            JOIN players p ON p.id = rov.player_id
+            WHERE rov.proposal_id = @ProposalId
+            ORDER BY rov.voted_at, p.display_name
+            """,
+            new { ProposalId = proposal.Id },
+            transaction)).ToList();
+
+        var voteCounts = options
+            .Select(option => new RescheduleOptionVoteCount(
+                option.OptionId,
+                votes.Count(vote => vote.OptionId == option.OptionId)))
+            .ToList();
+        var decision = RescheduleVoteRules.SelectWinner(voteCounts);
+        var selectedOption = decision.SelectedOptionId is { } selectedOptionId
+            ? options.Single(x => x.OptionId == selectedOptionId)
+            : null;
+
+        if (selectedOption is not null)
+        {
+            await connection.ExecuteAsync(
+                """
+                UPDATE sessions
+                SET scheduled_at = @NewTime,
+                    status = @Status,
+                    confirmation_message_id = NULL,
+                    link_message_id = NULL,
+                    one_hour_reminder_processed_at = NULL,
+                    updated_at = now()
+                WHERE id = @SessionId
+                """,
+                new { NewTime = selectedOption.ProposedAt, proposal.SessionId, Status = SessionStatus.Planned },
+                transaction);
+
+            await connection.ExecuteAsync(
+                """
+                UPDATE session_participants
+                SET rsvp_status = 'Pending',
+                    responded_at = NULL
+                WHERE session_id = @SessionId
+                  AND is_gm = false
+                  AND registration_status = @Active
+                """,
+                new { proposal.SessionId, Active = ParticipantRegistrationStatus.Active },
+                transaction);
+
+            await connection.ExecuteAsync(
+                """
+                UPDATE reschedule_proposals
+                SET status = 'Approved',
+                    selected_option_id = @SelectedOptionId,
+                    proposed_at = @ProposedAt
+                WHERE id = @ProposalId
+                """,
+                new
+                {
+                    ProposalId = proposal.Id,
+                    SelectedOptionId = selectedOption.OptionId,
+                    ProposedAt = selectedOption.ProposedAt
+                },
+                transaction);
+        }
+        else
+        {
+            await connection.ExecuteAsync(
+                "UPDATE reschedule_proposals SET status = 'Rejected' WHERE id = @ProposalId",
+                new { ProposalId = proposal.Id },
+                transaction);
+        }
+
+        var directRecipients = participants
+            .Select(p => new DirectNotificationRecipient(p.TelegramId, p.DisplayName))
+            .ToList();
+
+        await transaction.CommitAsync(ct);
+
+        await TryUpdateVoteMessage(proposal, options, participants, votes, decision, selectedOption, ct);
+
+        if (selectedOption is not null)
+        {
+            await TryUpdateBatchMessage(proposal, ct);
+        }
+
+        var mode = SessionNotificationModeExtensions.FromDatabaseValue(proposal.NotificationMode);
+        if (mode.ShouldSendDirectMessages())
+        {
+            await SendDirectResult(proposal, directRecipients, decision, selectedOption, ct);
+        }
+
+        logger.LogInformation(
+            "Finalized reschedule proposal {ProposalId} for session {SessionId} with outcome {Outcome}",
+            proposal.Id,
+            proposal.SessionId,
+            decision.Outcome);
+    }
+
+    private async Task TryUpdateVoteMessage(
+        DueRescheduleProposalDto proposal,
+        IReadOnlyList<RescheduleOptionDto> options,
+        IReadOnlyList<VoteParticipantDto> participants,
+        IReadOnlyList<RescheduleOptionVoteDto> votes,
+        RescheduleVoteDecision decision,
+        RescheduleOptionDto? selectedOption,
+        CancellationToken ct)
+    {
+        if (proposal.VoteMessageId is null)
+            return;
+
+        try
+        {
+            var resultText = selectedOption is not null
+                ? $"✅ <b>Голосование завершено.</b>\nПобедил вариант {selectedOption.DisplayOrder}: <b>{selectedOption.ProposedAt.FormatMoscow()}</b> (МСК)."
+                : $"❌ <b>Голосование завершено.</b>\n{System.Net.WebUtility.HtmlEncode(decision.Reason)}";
+
+            var text = $"""
+                {HandleRescheduleTimeInputHandler.BuildVotingMessage(
+                    proposal.Title,
+                    proposal.CurrentScheduledAt,
+                    proposal.VotingDeadlineAt,
+                    options,
+                    participants,
+                    votes)}
+
+                {resultText}
+                """;
+
+            await bot.EditMessageText(
+                chatId: proposal.TelegramChatId,
+                messageId: proposal.VoteMessageId.Value,
+                text: text,
+                parseMode: ParseMode.Html,
+                cancellationToken: ct);
+        }
+        catch (Exception ex)
+        {
+            logger.LogWarning(ex, "Failed to update finalized reschedule vote message for proposal {ProposalId}", proposal.Id);
+        }
+    }
+
+    private async Task TryUpdateBatchMessage(DueRescheduleProposalDto proposal, CancellationToken ct)
+    {
+        try
+        {
+            await using var connection = await dataSource.OpenConnectionAsync(ct);
+
+            var batchSessions = (await connection.QueryAsync<SessionBatchDto>(
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                new { proposal.BatchId })).ToList();
+
+            var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(
+                """
+                SELECT sp.session_id AS SessionId,
+                       p.display_name AS DisplayName,
+                       p.telegram_username AS TelegramUsername,
+                       sp.registration_status AS RegistrationStatus
+                FROM session_participants sp
+                JOIN players p ON sp.player_id = p.id
+                JOIN sessions s ON sp.session_id = s.id
+                WHERE s.batch_id = @BatchId AND sp.is_gm = false
+                ORDER BY sp.registration_status ASC, sp.created_at ASC, sp.responded_at ASC, p.created_at ASC
+                """,
+                new { proposal.BatchId })).ToList();
+
+            if (proposal.BatchMessageId.HasValue)
+            {
+                var renderResult = SessionBatchRenderer.Render(proposal.Title, batchSessions, batchParticipants);
+
+                await bot.EditMessageText(
+                    chatId: proposal.TelegramChatId,
+                    messageId: proposal.BatchMessageId.Value,
+                    text: renderResult.Text,
+                    parseMode: ParseMode.Html,
+                    replyMarkup: renderResult.Markup,
+                    cancellationToken: ct);
+            }
+            else
+            {
+                await bot.SendMessage(
+                    chatId: proposal.TelegramChatId,
+                    text: $"📣 Расписание обновлено после голосования за перенос сессии «{System.Net.WebUtility.HtmlEncode(proposal.Title)}».",
+                    parseMode: ParseMode.Html,
+                    cancellationToken: ct);
+            }
+        }
+        catch (Exception ex)
+        {
+            logger.LogWarning(ex, "Failed to update batch message for finalized proposal {ProposalId}", proposal.Id);
+        }
+    }
+
+    private async Task SendDirectResult(
+        DueRescheduleProposalDto proposal,
+        IReadOnlyList<DirectNotificationRecipient> recipients,
+        RescheduleVoteDecision decision,
+        RescheduleOptionDto? selectedOption,
+        CancellationToken ct)
+    {
+        var htmlText = selectedOption is not null
+            ? $"""
+                ✅ <b>Сессия перенесена по итогам голосования</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>
+                📅 Новое время: <b>{selectedOption.ProposedAt.FormatMoscow()}</b> (МСК)
+                """
+            : $"""
+                ❌ <b>Перенос сессии отклонён по итогам голосования</b>
+
+                📌 <b>{System.Net.WebUtility.HtmlEncode(proposal.Title)}</b>
+                📅 Время остаётся прежним: <b>{proposal.CurrentScheduledAt.FormatMoscow()}</b> (МСК)
+                Причина: {System.Net.WebUtility.HtmlEncode(decision.Reason)}
+                """;
+
+        await directSender.SendAsync(
+            recipients,
+            htmlText,
+            selectedOption is not null ? "reschedule-vote-approved" : "reschedule-vote-rejected",
+            proposal.SessionId,
+            ct);
+    }
+}

src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingInput.cs

@@ -0,0 +1,110 @@
+using System.Text.RegularExpressions;
+using GmRelay.Shared.Domain;
+
+namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
+
+internal sealed record RescheduleVotingInput(
+    IReadOnlyList<DateTimeOffset> Options,
+    DateTimeOffset Deadline)
+{
+    private static readonly Regex DateTimePattern = new(
+        @"(?<date>\d{1,2}\.\d{2}\.\d{4})\s+(?<time>\d{1,2}:\d{2})",
+        RegexOptions.CultureInvariant);
+
+    public static bool TryParse(
+        string text,
+        DateTimeOffset nowUtc,
+        out RescheduleVotingInput input,
+        out string error)
+    {
+        input = new RescheduleVotingInput([], default);
+        error = string.Empty;
+
+        var options = new List<DateTimeOffset>();
+        DateTimeOffset? deadline = null;
+
+        foreach (var rawLine in text.Split('\n', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+        {
+            var line = rawLine.Trim();
+            var match = DateTimePattern.Match(line);
+            if (!match.Success)
+                continue;
+
+            var value = $"{match.Groups["date"].Value} {match.Groups["time"].Value}";
+            if (!MoscowTime.TryParseMoscow(value, out var parsed))
+                continue;
+
+            if (IsDeadlineLine(line))
+            {
+                deadline = parsed;
+            }
+            else
+            {
+                options.Add(parsed);
+            }
+        }
+
+        if (options.Count is < 2 or > 3)
+        {
+            error = "Укажите от 2 до 3 вариантов времени.";
+            return false;
+        }
+
+        if (options.Distinct().Count() != options.Count)
+        {
+            error = "Варианты времени не должны повторяться.";
+            return false;
+        }
+
+        if (deadline is null)
+        {
+            error = "Укажите дедлайн голосования строкой «Дедлайн: ДД.ММ.ГГГГ ЧЧ:ММ».";
+            return false;
+        }
+
+        if (options.Any(option => option <= nowUtc))
+        {
+            error = "Все варианты времени должны быть в будущем.";
+            return false;
+        }
+
+        if (deadline.Value <= nowUtc)
+        {
+            error = "Дедлайн голосования должен быть в будущем.";
+            return false;
+        }
+
+        if (deadline.Value >= options.Min())
+        {
+            error = "Дедлайн голосования должен быть раньше первого предложенного времени.";
+            return false;
+        }
+
+        input = new RescheduleVotingInput(options, deadline.Value);
+        return true;
+    }
+
+    private static bool IsDeadlineLine(string line)
+    {
+        var normalized = line.TrimStart('-', '*', ' ', '\t').ToLowerInvariant();
+
+        return normalized.StartsWith("дедлайн", StringComparison.Ordinal)
+            || normalized.StartsWith("deadline", StringComparison.Ordinal)
+            || normalized.StartsWith("до:", StringComparison.Ordinal);
+    }
+}
+
+internal sealed record RescheduleOptionDto(
+    Guid OptionId,
+    int DisplayOrder,
+    DateTimeOffset ProposedAt);
+
+internal sealed record RescheduleOptionVoteDto(
+    Guid OptionId,
+    Guid PlayerId,
+    string DisplayName,
+    string? TelegramUsername);
+
+internal sealed record RescheduleOptionVoteCount(
+    Guid OptionId,
+    int VoteCount);

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

@@ -139,15 +139,10 @@ public sealed class UpdateRouter(
             return;
         }
 
-        if (action == "reschedule_vote" && parts.Length >= 3 && Guid.TryParse(parts[2], out var proposalId))
+        if (action == "reschedule_vote" && parts.Length >= 2 && Guid.TryParse(parts[1], out var optionId))
         {
-            var vote = parts[1]; // "yes" or "no"
-            if (vote is not ("yes" or "no"))
-                return;
-
             var command = new HandleRescheduleVoteCommand(
-                ProposalId: proposalId,
+                OptionId: optionId,
-                Vote: vote,
                 TelegramUserId: query.From.Id,
                 CallbackQueryId: query.Id,
                 ChatId: message.Chat.Id,
@@ -225,6 +220,7 @@ public sealed class UpdateRouter(
 
                         /listsessions — список предстоящих сессий
                         Игроки могут записаться кнопкой «На дату» и сняться кнопкой «Выйти».
+                        Owner и co-GM могут переносить сессии кнопкой «Перенести»: бот попросит 2-3 варианта времени и дедлайн голосования.
                         /help — эта справка
                         """,
                     cancellationToken: ct);

src/GmRelay.Bot/Migrations/V009__add_multi_option_reschedule_votes.sql

@@ -0,0 +1,35 @@
+-- Multi-option reschedule voting with a deadline.
+
+ALTER TABLE reschedule_proposals
+    ADD COLUMN voting_deadline_at TIMESTAMPTZ,
+    ADD COLUMN selected_option_id UUID;
+
+CREATE TABLE reschedule_options (
+    id              UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    proposal_id     UUID NOT NULL REFERENCES reschedule_proposals(id) ON DELETE CASCADE,
+    proposed_at     TIMESTAMPTZ NOT NULL,
+    display_order   INTEGER NOT NULL CHECK (display_order BETWEEN 1 AND 3),
+    created_at      TIMESTAMPTZ NOT NULL DEFAULT now(),
+    UNIQUE (proposal_id, id),
+    UNIQUE (proposal_id, display_order),
+    UNIQUE (proposal_id, proposed_at)
+);
+
+CREATE TABLE reschedule_option_votes (
+    id              UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    proposal_id     UUID NOT NULL REFERENCES reschedule_proposals(id) ON DELETE CASCADE,
+    player_id       UUID NOT NULL REFERENCES players(id) ON DELETE CASCADE,
+    option_id       UUID NOT NULL,
+    voted_at        TIMESTAMPTZ NOT NULL DEFAULT now(),
+    UNIQUE (proposal_id, player_id),
+    FOREIGN KEY (proposal_id, option_id)
+        REFERENCES reschedule_options(proposal_id, id)
+        ON DELETE CASCADE
+);
+
+CREATE INDEX ix_reschedule_voting_deadline
+    ON reschedule_proposals (voting_deadline_at)
+    WHERE status = 'Voting';
+
+CREATE INDEX ix_reschedule_option_votes_option
+    ON reschedule_option_votes (option_id);

src/GmRelay.Bot/Program.cs

@@ -75,6 +75,7 @@ builder.Services.AddHostedService<TelegramBotService>();
 
 // ── Session scheduler ────────────────────────────────────────────────
 builder.Services.AddHostedService<SessionSchedulerService>();
+builder.Services.AddHostedService<RescheduleVotingDeadlineService>();
 
 var host = builder.Build();
 

src/GmRelay.Web/wwwroot/app.css

@@ -1,5 +1,5 @@
 /* ============================================
-   GM-Relay Design System v1.6.0
+   GM-Relay Design System v1.7.0
    Dark RPG Dashboard Theme
    ============================================ */
 

tests/GmRelay.Bot.Tests/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandlerTests.cs

@@ -5,28 +5,115 @@ namespace GmRelay.Bot.Tests.Features.Sessions.RescheduleSession;
 public sealed class HandleRescheduleTimeInputHandlerTests
 {
     [Fact]
-    public void BuildVotingMessage_ShouldShowApprovedAndPendingParticipants()
+    public void TryParseVotingInput_ShouldAcceptTwoOptionsAndDeadline()
     {
-        var approvedId = Guid.NewGuid();
+        var now = new DateTimeOffset(2026, 4, 24, 8, 0, 0, TimeSpan.Zero);
-        var pendingId = Guid.NewGuid();
+
+        var ok = RescheduleVotingInput.TryParse(
+            """
+            25.04.2026 19:30
+            26.04.2026 18:00
+            Дедлайн: 25.04.2026 12:00
+            """,
+            now,
+            out var input,
+            out var error);
+
+        Assert.True(ok, error);
+        Assert.Equal(2, input.Options.Count);
+        Assert.Equal(new DateTimeOffset(2026, 4, 25, 16, 30, 0, TimeSpan.Zero), input.Options[0]);
+        Assert.Equal(new DateTimeOffset(2026, 4, 26, 15, 0, 0, TimeSpan.Zero), input.Options[1]);
+        Assert.Equal(new DateTimeOffset(2026, 4, 25, 9, 0, 0, TimeSpan.Zero), input.Deadline);
+    }
+
+    [Fact]
+    public void TryParseVotingInput_ShouldRejectSingleOption()
+    {
+        var now = new DateTimeOffset(2026, 4, 24, 8, 0, 0, TimeSpan.Zero);
+
+        var ok = RescheduleVotingInput.TryParse(
+            """
+            25.04.2026 19:30
+            Дедлайн: 25.04.2026 12:00
+            """,
+            now,
+            out _,
+            out var error);
+
+        Assert.False(ok);
+        Assert.Equal("Укажите от 2 до 3 вариантов времени.", error);
+    }
+
+    [Fact]
+    public void BuildVotingMessage_ShouldShowOptionsDeadlineVotesAndPendingParticipants()
+    {
+        var firstOptionId = Guid.NewGuid();
+        var secondOptionId = Guid.NewGuid();
+        var aliceId = Guid.NewGuid();
+        var bobId = Guid.NewGuid();
+        var charlieId = Guid.NewGuid();
         var currentTime = new DateTime(2026, 4, 25, 16, 30, 0, DateTimeKind.Utc);
-        var newTime = new DateTimeOffset(2026, 4, 26, 17, 0, 0, TimeSpan.Zero);
+        var deadline = new DateTimeOffset(2026, 4, 25, 9, 0, 0, TimeSpan.Zero);
+        var options = new List<RescheduleOptionDto>
+        {
+            new(firstOptionId, 1, new DateTimeOffset(2026, 4, 26, 16, 0, 0, TimeSpan.Zero)),
+            new(secondOptionId, 2, new DateTimeOffset(2026, 4, 27, 17, 0, 0, TimeSpan.Zero))
+        };
         var participants = new List<VoteParticipantDto>
         {
-            new(approvedId, "Alice", "alice"),
+            new(aliceId, "Alice", "alice"),
-            new(pendingId, "Bob", null)
+            new(bobId, "Bob", null),
+            new(charlieId, "Charlie", null)
+        };
+        var votes = new List<RescheduleOptionVoteDto>
+        {
+            new(firstOptionId, aliceId, "Alice", "alice"),
+            new(secondOptionId, bobId, "Bob", null)
         };
 
         var text = HandleRescheduleTimeInputHandler.BuildVotingMessage(
             "Shadowrun",
             currentTime,
-            newTime,
+            deadline,
+            options,
             participants,
-            [approvedId]);
+            votes);
 
         Assert.Contains("Shadowrun", text);
-        Assert.Contains("✅ @alice", text);
+        Assert.Contains("Дедлайн: <b>25 апреля 2026, 12:00</b> (МСК)", text);
-        Assert.Contains("⏳ Bob", text);
+        Assert.Contains("1. <b>26 апреля 2026, 19:00</b> (МСК) — 1 голос", text);
-        Assert.Contains("Голоса: 1/2 ✅", text);
+        Assert.Contains("@alice", text);
+        Assert.Contains("2. <b>27 апреля 2026, 20:00</b> (МСК) — 1 голос", text);
+        Assert.Contains("Bob", text);
+        Assert.Contains("Не проголосовали: Charlie", text);
+        Assert.Contains("Голосов: 2/3", text);
+    }
+
+    [Fact]
+    public void BuildVotingKeyboard_ShouldCreateOneButtonPerOption()
+    {
+        var firstOptionId = Guid.NewGuid();
+        var secondOptionId = Guid.NewGuid();
+        var options = new List<RescheduleOptionDto>
+        {
+            new(firstOptionId, 1, new DateTimeOffset(2026, 4, 26, 16, 0, 0, TimeSpan.Zero)),
+            new(secondOptionId, 2, new DateTimeOffset(2026, 4, 27, 17, 0, 0, TimeSpan.Zero))
+        };
+
+        var keyboard = HandleRescheduleTimeInputHandler.BuildVotingKeyboard(options);
+        var buttons = keyboard.InlineKeyboard.SelectMany(row => row).ToList();
+
+        Assert.Collection(
+            buttons,
+            button =>
+            {
+                Assert.Equal("1. 26.04 19:00", button.Text);
+                Assert.Equal($"reschedule_vote:{firstOptionId}", button.CallbackData);
+            },
+            button =>
+            {
+                Assert.Equal("2. 27.04 20:00", button.Text);
+                Assert.Equal($"reschedule_vote:{secondOptionId}", button.CallbackData);
+            });
     }
 }

tests/GmRelay.Bot.Tests/Features/Sessions/RescheduleSession/RescheduleVoteRulesTests.cs

@@ -5,32 +5,50 @@ namespace GmRelay.Bot.Tests.Features.Sessions.RescheduleSession;
 public sealed class RescheduleVoteRulesTests
 {
     [Fact]
-    public void Evaluate_ShouldReject_WhenParticipantVotesNo()
+    public void SelectWinner_ShouldApproveSingleTopOption()
     {
-        var decision = RescheduleVoteRules.Evaluate("no", totalParticipants: 4, approvedParticipants: 3);
+        var winningOptionId = Guid.NewGuid();
+        var otherOptionId = Guid.NewGuid();
 
-        Assert.Equal(RescheduleVoteOutcome.Rejected, decision.Outcome);
+        var decision = RescheduleVoteRules.SelectWinner(
-        Assert.False(decision.ShouldRescheduleSession);
+            [
-        Assert.Equal("Вы проголосовали против переноса.", decision.CallbackText);
+                new RescheduleOptionVoteCount(winningOptionId, 3),
-    }
+                new RescheduleOptionVoteCount(otherOptionId, 1)
-
+            ]);
-    [Fact]
-    public void Evaluate_ShouldApprove_WhenEveryoneVotedYes()
-    {
-        var decision = RescheduleVoteRules.Evaluate("yes", totalParticipants: 3, approvedParticipants: 3);
 
         Assert.Equal(RescheduleVoteOutcome.Approved, decision.Outcome);
-        Assert.True(decision.ShouldRescheduleSession);
+        Assert.Equal(winningOptionId, decision.SelectedOptionId);
-        Assert.True(decision.ShouldResetParticipantRsvps);
+        Assert.Equal("Победил вариант с большинством голосов.", decision.Reason);
     }
 
     [Fact]
-    public void Evaluate_ShouldStayPending_WhileVotesOutstanding()
+    public void SelectWinner_ShouldRejectTie()
     {
-        var decision = RescheduleVoteRules.Evaluate("yes", totalParticipants: 5, approvedParticipants: 2);
+        var firstOptionId = Guid.NewGuid();
+        var secondOptionId = Guid.NewGuid();
 
-        Assert.Equal(RescheduleVoteOutcome.Pending, decision.Outcome);
+        var decision = RescheduleVoteRules.SelectWinner(
-        Assert.False(decision.ShouldRescheduleSession);
+            [
-        Assert.False(decision.ShouldResetParticipantRsvps);
+                new RescheduleOptionVoteCount(firstOptionId, 2),
+                new RescheduleOptionVoteCount(secondOptionId, 2)
+            ]);
+
+        Assert.Equal(RescheduleVoteOutcome.Rejected, decision.Outcome);
+        Assert.Null(decision.SelectedOptionId);
+        Assert.Equal("Голоса разделились поровну, перенос не применяется.", decision.Reason);
+    }
+
+    [Fact]
+    public void SelectWinner_ShouldRejectWhenNobodyVoted()
+    {
+        var decision = RescheduleVoteRules.SelectWinner(
+            [
+                new RescheduleOptionVoteCount(Guid.NewGuid(), 0),
+                new RescheduleOptionVoteCount(Guid.NewGuid(), 0)
+            ]);
+
+        Assert.Equal(RescheduleVoteOutcome.Rejected, decision.Outcome);
+        Assert.Null(decision.SelectedOptionId);
+        Assert.Equal("Никто не проголосовал до дедлайна, перенос не применяется.", decision.Reason);
     }
 }