fix: combine session image and text into single Telegram message

When creating a session with an image, send it as a single SendPhoto
with the schedule text as caption (+ reply markup), instead of two
separate messages. Falls back to two messages if caption exceeds
Telegram's 1024-char limit.

Also adds BatchMessageEditor helper that transparently handles
EditMessageText vs EditMessageCaption depending on whether the batch
message is a text or photo message. Updated all handlers and web
service to use this helper.

Version bump to 1.9.7.

.gitea/workflows/deploy.yml

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

Directory.Build.props

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

compose.yaml

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

src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs

@@ -106,13 +106,13 @@ public sealed class CancelSessionHandler(
 
         try
         {
-            await bot.EditMessageText(
+            await BatchMessageEditor.EditBatchMessageAsync(
+                bot,
                 chatId: command.ChatId,
                 messageId: session.BatchMessageId ?? command.MessageId,
                 text: renderResult.Text,
-                parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
                 replyMarkup: renderResult.Markup,
-                cancellationToken: ct);
+                ct);
 
             await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия отменена!", cancellationToken: ct);
             

src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs

@@ -185,31 +185,63 @@ public sealed class CreateSessionHandler(
 
             var renderResult = SessionBatchRenderer.Render(title, sessions, Array.Empty<ParticipantBatchDto>());
 
-            if (imageReference is not null)
+            Message batchMessage;
+
+            if (imageReference is not null && renderResult.Text.Length <= 1024)
             {
+                // Картинка + расписание умещаются в одном Telegram-фото с подписью
                 try
                 {
-                    await botClient.SendPhoto(
+                    batchMessage = await botClient.SendPhoto(
                         chatId: chatId,
                         messageThreadId: messageThreadId,
                         photo: InputFile.FromString(imageReference),
-                        caption: $"🎲 {System.Net.WebUtility.HtmlEncode(title)}",
+                        caption: renderResult.Text,
                         parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
+                        replyMarkup: renderResult.Markup,
                         cancellationToken: cancellationToken);
                 }
                 catch (Exception ex)
                 {
-                    logger.LogWarning(ex, "Не удалось отправить картинку для батча {BatchId}", batchId);
+                    logger.LogWarning(ex, "Не удалось отправить картинку для батча {BatchId}, отправляем текстом", batchId);
+                    batchMessage = await botClient.SendMessage(
+                        chatId: chatId,
+                        messageThreadId: messageThreadId,
+                        text: renderResult.Text,
+                        parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
+                        replyMarkup: renderResult.Markup,
+                        cancellationToken: cancellationToken);
                 }
             }
+            else
+            {
+                // Текст слишком длинный для caption — fallback на два сообщения
+                if (imageReference is not null)
+                {
+                    try
+                    {
+                        await botClient.SendPhoto(
+                            chatId: chatId,
+                            messageThreadId: messageThreadId,
+                            photo: InputFile.FromString(imageReference),
+                            caption: $"🎲 {System.Net.WebUtility.HtmlEncode(title)}",
+                            parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
+                            cancellationToken: cancellationToken);
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.LogWarning(ex, "Не удалось отправить картинку для батча {BatchId}", batchId);
+                    }
+                }
 
-            var batchMessage = await botClient.SendMessage(
+                batchMessage = await botClient.SendMessage(
-                chatId: chatId,
+                    chatId: chatId,
-                messageThreadId: messageThreadId,
+                    messageThreadId: messageThreadId,
-                text: renderResult.Text,
+                    text: renderResult.Text,
-                parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
+                    parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-                replyMarkup: renderResult.Markup,
+                    replyMarkup: renderResult.Markup,
-                cancellationToken: cancellationToken);
+                    cancellationToken: cancellationToken);
+            }
 
             await connection.ExecuteAsync(
                 "UPDATE sessions SET batch_message_id = @MsgId WHERE batch_id = @BatchId",

src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs

@@ -138,13 +138,13 @@ public sealed class JoinSessionHandler(
             // 4. Перерисовываем сообщение
             var renderResult = SessionBatchRenderer.Render(batchInfo.Title, batchSessions.ToList(), batchParticipants.ToList());
 
-            await bot.EditMessageText(
+            await BatchMessageEditor.EditBatchMessageAsync(
+                bot,
                 chatId: command.ChatId,
                 messageId: command.MessageId,
                 text: renderResult.Text,
-                parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
                 replyMarkup: renderResult.Markup,
-                cancellationToken: ct);
+                ct);
 
             var callbackText = registrationStatus == ParticipantRegistrationStatus.Waitlisted
                 ? "Основной состав заполнен. Вы добавлены в лист ожидания."

src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs

@@ -184,13 +184,13 @@ public sealed class LeaveSessionHandler(
 
             var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
 
-            await bot.EditMessageText(
+            await BatchMessageEditor.EditBatchMessageAsync(
+                bot,
                 chatId: command.ChatId,
                 messageId: command.MessageId,
                 text: renderResult.Text,
-                parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
                 replyMarkup: renderResult.Markup,
-                cancellationToken: ct);
+                ct);
 
             var callbackText = participant.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted
                 ? "Вы удалены из листа ожидания."

src/GmRelay.Bot/Features/Sessions/CreateSession/PromoteWaitlistedPlayerHandler.cs

@@ -164,13 +164,13 @@ public sealed class PromoteWaitlistedPlayerHandler(
 
             var renderResult = SessionBatchRenderer.Render(session.Title, batchSessions, batchParticipants);
 
-            await bot.EditMessageText(
+            await BatchMessageEditor.EditBatchMessageAsync(
+                bot,
                 chatId: command.ChatId,
                 messageId: session.BatchMessageId ?? command.MessageId,
                 text: renderResult.Text,
-                parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
                 replyMarkup: renderResult.Markup,
-                cancellationToken: ct);
+                ct);
 
             await bot.AnswerCallbackQuery(command.CallbackQueryId, $"{promoted.DisplayName} переведен(а) в основной состав.", cancellationToken: ct);
         }

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

@@ -378,13 +378,13 @@ public sealed class HandleRescheduleTimeInputHandler(
                 var renderResult = SessionBatchRenderer.Render(
                     proposal.Title, batchSessions, batchParticipants);
 
-                await bot.EditMessageText(
+                await BatchMessageEditor.EditBatchMessageAsync(
+                    bot,
                     chatId: proposal.TelegramChatId,
                     messageId: proposal.BatchMessageId.Value,
                     text: renderResult.Text,
-                    parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
                     replyMarkup: renderResult.Markup,
-                    cancellationToken: ct);
+                    ct);
             }
             else
             {

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

@@ -306,13 +306,13 @@ public sealed class RescheduleVotingDeadlineService(
             {
                 var renderResult = SessionBatchRenderer.Render(proposal.Title, batchSessions, batchParticipants);
 
-                await bot.EditMessageText(
+                await BatchMessageEditor.EditBatchMessageAsync(
+                    bot,
                     chatId: proposal.TelegramChatId,
                     messageId: proposal.BatchMessageId.Value,
                     text: renderResult.Text,
-                    parseMode: ParseMode.Html,
                     replyMarkup: renderResult.Markup,
-                    cancellationToken: ct);
+                    ct);
             }
             else
             {

src/GmRelay.Shared/Rendering/BatchMessageEditor.cs

@@ -0,0 +1,51 @@
+using Telegram.Bot;
+using Telegram.Bot.Types.Enums;
+using Telegram.Bot.Types.ReplyMarkups;
+
+namespace GmRelay.Shared.Rendering;
+
+/// <summary>
+/// Handles editing batch messages that may be either text or photo messages.
+/// When the batch was created with SendPhoto (image + caption), we need
+/// EditMessageCaption instead of EditMessageText.
+/// </summary>
+public static class BatchMessageEditor
+{
+    /// <summary>
+    /// Edits a batch message, automatically detecting whether it is a text or photo message.
+    /// Tries EditMessageText first; on failure falls back to EditMessageCaption.
+    /// </summary>
+    public static async Task EditBatchMessageAsync(
+        ITelegramBotClient bot,
+        long chatId,
+        int messageId,
+        string text,
+        InlineKeyboardMarkup? replyMarkup,
+        CancellationToken ct = default)
+    {
+        try
+        {
+            await bot.EditMessageText(
+                chatId: chatId,
+                messageId: messageId,
+                text: text,
+                parseMode: ParseMode.Html,
+                replyMarkup: replyMarkup,
+                cancellationToken: ct);
+        }
+        catch (Telegram.Bot.Exceptions.ApiRequestException ex)
+            when (ex.Message.Contains("there is no text in the message", StringComparison.OrdinalIgnoreCase))
+        {
+            // The batch message is a photo — use EditMessageCaption instead.
+            // Caption is limited to 1024 chars; if text exceeds that, truncate gracefully.
+            var caption = text.Length <= 1024 ? text : text[..1021] + "...";
+            await bot.EditMessageCaption(
+                chatId: chatId,
+                messageId: messageId,
+                caption: caption,
+                parseMode: ParseMode.Html,
+                replyMarkup: replyMarkup,
+                cancellationToken: ct);
+        }
+    }
+}

src/GmRelay.Web/Services/SessionService.cs

@@ -1048,11 +1048,11 @@ public sealed class SessionService(
 
             var renderResult = SessionBatchRenderer.Render(title, sessions, participants);
 
-            await bot.EditMessageText(
+            await BatchMessageEditor.EditBatchMessageAsync(
+                bot,
                 chatId: chatId,
                 messageId: messageId,
                 text: renderResult.Text,
-                parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
                 replyMarkup: renderResult.Markup);
         }
         catch (Exception ex)