FrigaT/BotPages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 25 Wiki Activity

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

Browse Source
This commit is contained in:
FrigaT
2025-12-06 09:15:00 +03:00
parent fce6e8d013
commit db122e8aef
6 changed files with 61 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
BotPages.Core/Abstractions/IMessengerAdapter.cs
View File

@@ -14,9 +14,12 @@ public interface IMessengerAdapter
/// <summary>
/// Отправить текстовое сообщение в чат.
/// </summary>
Task SendTextAsync(string chatId, string text, MessageFormat format,
Task<string?> SendTextAsync(string chatId, string text, MessageFormat format,
IEnumerable<IEnumerable<InlineButton>>? inline,
IEnumerable<IEnumerable<ReplyButton>>? reply, CancellationToken ct);
IEnumerable<IEnumerable<ReplyButton>>? reply,
string? messageId,
CancellationToken ct
);
/// <summary>
/// Отправить файл в чат.
@@ -28,16 +31,6 @@ public interface IMessengerAdapter
/// </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>

43
BotPages.Core/Context/PageContext.cs
View File

@@ -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;
}

5
BotPages.Core/Context/PageContextAdapterExtensions.cs
View File

@@ -11,11 +11,12 @@ 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>
/// Отправить файл.

44
BotPages.Core/Messaging/MessageBuilder.cs
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;
}
}