Добавлено редактирование сообщений. Убран прогресс
All checks were successful
CI / build-test (push) Successful in 52s
Release / pack-and-publish (release) Successful in 46s

This commit is contained in:
2025-12-06 09:15:00 +03:00
parent fce6e8d013
commit db122e8aef
6 changed files with 61 additions and 156 deletions

View File

@@ -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,17 +118,11 @@ 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;
// Текст
if (!string.IsNullOrWhiteSpace(_text))
{
@@ -131,7 +130,7 @@ public sealed class MessageBuilder
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);
}
// Файлы
@@ -147,25 +146,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;
}
}