Добавлен вывод кнопок для файлов

BotPages.Core/Abstractions/IMessengerAdapter.cs

@@ -9,35 +9,39 @@ namespace BotPages.Core.Abstractions;
 /// </summary>
 public interface IMessengerAdapter
 {
+    /// <summary>
+    /// Доступные возможности мессенджера.
+    /// </summary>
     Capabilities Capabilities { get; }
 
     /// <summary>
     /// Отправить текстовое сообщение в чат.
     /// </summary>
-    Task SendTextAsync(string chatId, string text, MessageFormat format,
-        IEnumerable<IEnumerable<InlineButton>>? inline,
-        IEnumerable<IEnumerable<ReplyButton>>? reply, CancellationToken ct);
+    Task<string?> SendTextAsync(string chatId, 
+        string text, 
+        MessageFormat format = MessageFormat.Plain,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        string? messageId = null, 
+        CancellationToken ct = default
+    );
 
     /// <summary>
     /// Отправить файл в чат.
     /// </summary>
-    Task SendFileAsync(string chatId, FileDescriptor file, string? caption, MessageFormat? captionFormat, CancellationToken ct);
+    Task SendFileAsync(string chatId, 
+        FileDescriptor file, 
+        string? caption = null, 
+        MessageFormat? captionFormat = null,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        CancellationToken ct = default);
 
     /// <summary>
     /// Создать билдер альбома для отправки медиагруппы.
     /// </summary>
     IAlbumBuilder CreateAlbumBuilder(PageContext ctx);
 
-    /// <summary>
-    /// Начать отображение прогресса операции.
-    /// </summary>
-    Task<string?> StartProgressAsync(PageContext ctx, string title, CancellationToken ct);
-
-    /// <summary>
-    /// Обновить прогресс операции.
-    /// </summary>
-    Task UpdateProgressAsync(PageContext ctx, string messageId, string title, int percent, CancellationToken ct);
-
     /// <summary>
     /// Вызывается при выходе со страницы.
     /// </summary>

BotPages.Core/Context/PageContext.cs

@@ -27,47 +27,4 @@ public sealed class PageContext
     /// </summary>
     public IAlbumBuilder Albums => Adapter.CreateAlbumBuilder(this);
 
-    /// <summary>
-    /// Начать прогресс операции.
-    /// </summary>
-    public async Task<string?> StartProgressAsync(string title, CancellationToken ct)
-    {
-        var messageId = await Adapter.StartProgressAsync(this, title, ct);
-
-        if (messageId != null)
-        {
-            _progressMessageId = messageId;
-            _progressTitle = title;
-        }
-
-        return messageId;
-    }
-
-    /// <summary>
-    /// Обновить прогресс операции.
-    /// </summary>
-    public Task UpdateProgressAsync(int percent, CancellationToken ct)
-    {
-        if (_progressMessageId != null)
-        {
-            return Adapter.UpdateProgressAsync(this, _progressMessageId, _progressTitle ?? "", percent, ct);
-        }
-        else
-        {
-            return Task.CompletedTask;
-        }
-    }
-
-    /// <summary>
-    /// Обновить прогресс операции.
-    /// </summary>
-    public Task UpdateProgressAsync(string messageId, int percent, CancellationToken ct)
-    {
-        return Adapter.UpdateProgressAsync(this, messageId, _progressTitle ?? "", percent, ct);
-    }
-
-
-    private string? _progressMessageId = null;
-    private string? _progressTitle = null;
-
 }

BotPages.Core/Context/PageContextAdapterExtensions.cs

@@ -11,21 +11,31 @@ public static class PageContextAdapterExtensions
     /// <summary>
     /// Отправить текстовое сообщение.
     /// </summary>
-    public static Task SendTextAsync(this PageContext ctx, string text, MessageFormat format = MessageFormat.Plain,
+    public static Task<string?> SendTextAsync(this PageContext ctx, 
+        string text, 
+        MessageFormat format = MessageFormat.Plain,
         IEnumerable<IEnumerable<InlineButton>>? inline = null,
         IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        string? messageId = null,
         CancellationToken ct = default)
-        => ctx.Adapter.SendTextAsync(ctx.Update.Chat.Id, text, format, inline, reply, ct);
+        => ctx.Adapter.SendTextAsync(ctx.Update.Chat.Id, text, format, inline, reply, messageId, ct);
 
     /// <summary>
     /// Отправить файл.
     /// </summary>
-    public static Task SendFileAsync(this PageContext ctx, FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null, CancellationToken ct = default)
-        => ctx.Adapter.SendFileAsync(ctx.Update.Chat.Id, file, caption, captionFormat, ct);
-
-    /// <summary>
-    /// Отправить файл.
-    /// </summary>
-    public static Task SendFileAsync(this PageContext ctx, FileDescriptor file, string? caption = null, CancellationToken ct = default)
-        => ctx.Adapter.SendFileAsync(ctx.Update.Chat.Id, file, caption, null, ct);
+    public static Task SendFileAsync(this PageContext ctx, 
+        FileDescriptor file, 
+        string? caption = null, 
+        MessageFormat? captionFormat = null,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        CancellationToken ct = default
+    )
+        => ctx.Adapter.SendFileAsync(chatId: ctx.Update.Chat.Id, 
+            file: file, 
+            caption: caption, 
+            captionFormat: captionFormat,
+            inline: inline,
+            reply: reply,
+            ct: ct);
 }

BotPages.Core/Messaging/MessageBuilder.cs

@@ -14,10 +14,8 @@ public sealed class MessageBuilder
     private readonly List<List<ReplyButton>> _reply = new();
     private readonly List<(FileDescriptor file, string? caption, MessageFormat? captionFormat)> _files = new();
     private readonly List<(FileDescriptor file, string? caption, MessageFormat? captionFormat)> _album = new();
-    private string? _progressTitle = null;
-    private int? _progressPercent = null;
-    private string? _progressMessageId = null;
     private bool _disableReplyKeyboard;
+    private string? _editMessageId = null;
 
     /// <summary>Создать билдер сообщений.</summary>
     public MessageBuilder(PageContext ctx) => _ctx = ctx;
@@ -30,6 +28,13 @@ public sealed class MessageBuilder
         return this;
     }
 
+    /// <summary>Редактировать сообщение.</summary>
+    public MessageBuilder EditMessage(string messagId)
+    {
+        _editMessageId = messagId;
+        return this;
+    }
+
     /// <summary>Добавить inline‑кнопку.</summary>
     public MessageBuilder Inline(string label, string value)
     {
@@ -113,30 +118,30 @@ public sealed class MessageBuilder
         return this;
     }
 
-    /// <summary>Установить прогресс операции.</summary>
-    public MessageBuilder Progress(string title, int percent = 0)
-    {
-        _progressTitle = title;
-        _progressPercent = percent;
-        return this;
-    }
-
     /// <summary>Отправить собранное сообщение.</summary>
-    public async Task SendAsync(CancellationToken ct = default)
+    public async Task<string?> SendAsync(CancellationToken ct = default)
     {
+        string? messageId = null;
+
+        List<List<ReplyButton>>? reply = null;
+        if (_disableReplyKeyboard) reply = new();
+        else if (_reply.Any()) reply = _reply;
+
         // Текст
         if (!string.IsNullOrWhiteSpace(_text))
         {
-            List<List<ReplyButton>>? reply = null;
-            if (_disableReplyKeyboard) reply = new();
-            else if (_reply.Any()) reply = _reply;
-
-            await _ctx.SendTextAsync(_text, _format, _inline, reply, ct);
+            messageId = await _ctx.SendTextAsync(_text, _format, _inline, reply, _editMessageId, ct);
         }
 
         // Файлы
         foreach (var (file, caption, captionFormat) in _files)
-            await _ctx.SendFileAsync(file, caption, captionFormat, ct);
+            await _ctx.SendFileAsync(file: file
+                , caption: caption
+                , captionFormat: captionFormat
+                , reply: reply
+                , inline: _inline
+                , ct: ct
+            );
 
         // Альбом
         if (_album.Count > 0)
@@ -147,25 +152,12 @@ public sealed class MessageBuilder
             await builder.SendAsync(ct);
         }
 
-        // Прогресс
-        if (_progressTitle is not null)
-        {
-            if (_progressMessageId is null)
-                _progressMessageId = await _ctx.StartProgressAsync(_progressTitle, ct);
-
-            if (_progressPercent > 0 && !string.IsNullOrEmpty(_progressMessageId))
-                await _ctx.UpdateProgressAsync(_progressMessageId, _progressPercent.Value, ct);
-        }
-
         _text = null;
         _files.Clear();
         _album.Clear();
 
-        if (_progressPercent >= 100)
-        {
-            _progressTitle = null;
-            _progressMessageId = null;
-            _progressPercent = null;
-        }
+        _editMessageId = null;
+
+        return messageId;
     }
 }

BotPages.Telegram/TelegramAdapter.cs

@@ -85,21 +85,25 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
     }
 
     /// <inheritdoc />
-    public async Task SendTextAsync(string chatId, string text, MessageFormat format,
-        IEnumerable<IEnumerable<InlineButton>>? inline,
-        IEnumerable<IEnumerable<ReplyButton>>? reply, CancellationToken ct)
+    public async Task<string?> SendTextAsync(string chatId, string text, 
+        MessageFormat format = MessageFormat.Plain,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        string? messageId = null, 
+        CancellationToken ct = default)
     {
         if (_client is null)
         {
             _logger.Log(LogLevel.Critical, $"{MessengerType} client is not initialized.");
-            return;
+            return null;
         }
 
+        InlineKeyboardMarkup? inlineMarkup = null;
         ReplyMarkup? markup = null;
 
         if (inline is not null && inline.Any())
         {
-            markup = new InlineKeyboardMarkup(
+            inlineMarkup = new InlineKeyboardMarkup(
                 inline.Select(row => row.Select(b => new InlineKeyboardButton(b.Label, b.Value)).ToArray())
                       .ToArray()
             );
@@ -154,17 +158,44 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
             text = text.Substring(0, Capabilities.MaxMessageLength);
         }
 
-        await _client.SendMessage(
-            chatId: long.Parse(chatId),
-            text: text,
-            parseMode: parseMode,
-            replyMarkup: markup,
-            cancellationToken: ct
-        );
+        if (!string.IsNullOrWhiteSpace(messageId))
+        {
+            await _client.EditMessageText(
+                messageId: int.Parse(messageId),
+                chatId: long.Parse(chatId),
+                text: text,
+                parseMode: parseMode,
+                replyMarkup: inlineMarkup,
+                cancellationToken: ct
+            );
+
+            return messageId;
+        }
+        else
+        {
+            if (inlineMarkup is not null) markup = inlineMarkup;
+
+            var message = await _client.SendMessage(
+                chatId: long.Parse(chatId),
+                text: text,
+                parseMode: parseMode,
+                replyMarkup: markup,
+                cancellationToken: ct
+            );
+
+            return message.Id.ToString();
+        }
     }
 
     /// <inheritdoc />
-    public async Task SendFileAsync(string chatId, FileDescriptor file, string? caption, MessageFormat? captionFormat, CancellationToken ct)
+    public async Task SendFileAsync(string chatId, 
+        FileDescriptor file, 
+        string? caption = null, 
+        MessageFormat? captionFormat = null,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        CancellationToken ct = default
+    )
     {
         if (_client is null)
         {
@@ -226,20 +257,46 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
                 }
         }
 
+        ReplyMarkup? markup = null;
+
+        if (inline is not null && inline.Any())
+        {
+            markup = new InlineKeyboardMarkup(
+                inline.Select(row => row.Select(b => new InlineKeyboardButton(b.Label, b.Value)).ToArray())
+                      .ToArray()
+            );
+        }
+        else if (reply is not null)
+        {
+            if (reply.Any())
+            {
+                markup = new ReplyKeyboardMarkup(
+                    reply.Select(row => row.Select(b => new KeyboardButton(b.Label)).ToArray()).ToArray()
+                )
+                {
+                    ResizeKeyboard = true
+                };
+            }
+            else
+            {
+                markup = new ReplyKeyboardRemove();
+            }
+        }
+
         // В зависимости от FileKind выбираем подходящий метод
         switch (file.Kind)
         {
             case FileKind.Photo:
-                await _client.SendPhoto(long.Parse(chatId), inputFile, caption ?? "", parseMode, cancellationToken: ct);
+                await _client.SendPhoto(long.Parse(chatId), inputFile, caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
             case FileKind.Video:
-                await _client.SendVideo(long.Parse(chatId), inputFile, caption: caption ?? "", parseMode, cancellationToken: ct);
+                await _client.SendVideo(long.Parse(chatId), inputFile, caption: caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
             case FileKind.Audio:
-                await _client.SendAudio(long.Parse(chatId), inputFile, caption ?? "", parseMode, cancellationToken: ct);
+                await _client.SendAudio(long.Parse(chatId), inputFile, caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
             default:
-                await _client.SendDocument(long.Parse(chatId), inputFile, caption ?? "", parseMode, cancellationToken: ct);
+                await _client.SendDocument(long.Parse(chatId), inputFile, caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
         }
     }
@@ -247,62 +304,6 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
     /// <inheritdoc />
     public IAlbumBuilder CreateAlbumBuilder(PageContext ctx) => new TelegramAlbumBuilder(this, ctx, _logger, _client);
 
-    /// <inheritdoc />
-    public async Task<string?> StartProgressAsync(PageContext ctx, string title, CancellationToken ct)
-    {
-        if (_client is null)
-        {
-            _logger.Log(LogLevel.Critical, $"{MessengerType} client is not initialized.");
-            return null;
-        }
-
-        string text = "0%";
-        if (!string.IsNullOrEmpty(title))
-        {
-            text = title + Environment.NewLine + text;
-        }
-
-        var message = await _client.SendMessage(
-            chatId: long.Parse(ctx.Update.Chat.Id),
-            text: text,
-            cancellationToken: ct
-        );
-
-        return message.Id.ToString();
-    }
-
-    /// <inheritdoc />
-    public async Task UpdateProgressAsync(PageContext ctx, string messageId, string title, int percent, CancellationToken ct)
-    {
-        if (_client is null)
-        {
-            _logger.Log(LogLevel.Critical, $"{MessengerType} client is not initialized.");
-            return;
-        }
-
-        percent = Math.Clamp(percent, 0, 100);
-
-        string text = $"{percent}%";
-        if (!string.IsNullOrEmpty(title))
-        {
-            text = title + Environment.NewLine + text;
-        }
-
-        try
-        {
-            await _client.EditMessageText(
-                messageId: int.Parse(messageId),
-                chatId: long.Parse(ctx.Update.Chat.Id),
-                text: text,
-                cancellationToken: ct
-            );
-        }
-        catch (Exception ex)
-        {
-            _logger.Log(LogLevel.Critical, ex.Message, ex);
-        }
-    }
-
     /// <inheritdoc />
     public Task OnLeaveAsync(PageContext ctx, CancellationToken ct) => Task.CompletedTask;
 }

BotPages.Telegram/TelegramAlbumBuilder.cs

@@ -53,7 +53,7 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
         {
             _logger.Log(LogLevel.Warn, "Albums not supported. Degraded to sequential sends.");
             foreach (var (file, caption, captionFormat) in _items)
-                await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct);
+                await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct: ct);
             return;
         }
 
@@ -95,7 +95,7 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
             {
                 // Telegram не поддерживает document в альбомах — деградация
                 _logger.Log(LogLevel.Warn, $"Document '{file.Kind}' in album not supported. Sending document separately.");
-                await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct);
+                await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct: ct);
             }
         }
 

Demo/Pages/FilesPage.cs

@@ -20,7 +20,7 @@ public sealed class FilesPage : SingletonPage
     {
         foreach (var file in files)
         {
-            await ctx.SendFileAsync(file, $"Файл '{file.Name}' получен и отправлен обратно.", ct);
+            await ctx.SendFileAsync(file, $"Файл '{file.Name}' получен и отправлен обратно.", ct: ct);
         }
 
         //Обращение через Storage

Demo/Pages/SubmitPage.cs

@@ -12,8 +12,8 @@ public sealed class SubmitPage : SingletonPage
     {
         var progress = new MessageBuilder(ctx);
 
-        await progress
-            .Progress("Отправка заявки", 7)
+        var messageId = await progress
+            .Text("Отправка заявки\n7%")
             .SendAsync(ct);
 
         int i = 7;
@@ -22,7 +22,8 @@ public sealed class SubmitPage : SingletonPage
             i += 25;
             Thread.Sleep(TimeSpan.FromMilliseconds(200));
             await progress
-                .Progress("Отправка заявки", i)
+                .Text($"Отправка заявки\n{i}%")
+                .EditMessage(messageId!)
                 .SendAsync(ct);
         }
         while (i < 100);