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 35s
Details
Release / pack-and-publish (release) Successful in 38s
Details

Browse Source
This commit is contained in:
FrigaT
2025-12-05 20:13:27 +03:00
parent 308f1af33a
commit d97fcaaa20
5 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BotPages.Core/Abstractions/IAlbumBuilder.cs
View File

@@ -6,7 +6,7 @@
public interface IAlbumBuilder
{
/// <summary>Добавить элемент в альбом.</summary>
IAlbumBuilder Add(FileDescriptor file, string? caption = null);
IAlbumBuilder Add(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null);
/// <summary>Отправить альбом.</summary>
Task SendAsync(CancellationToken ct = default);
}

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

@@ -21,7 +21,7 @@ public interface IMessengerAdapter
/// <summary>
/// Отправить файл в чат.
/// </summary>
Task SendFileAsync(string chatId, FileDescriptor file, string? caption, CancellationToken ct);
Task SendFileAsync(string chatId, FileDescriptor file, string? caption, MessageFormat? captionFormat, CancellationToken ct);
/// <summary>
/// Создать билдер альбома для отправки медиагруппы.

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

@@ -51,11 +51,17 @@ public sealed class PageContext
CancellationToken ct = default)
=> Adapter.SendTextAsync(this.Update.Chat.Id, text, format, inline, reply, ct);
/// <summary>
/// Отправить файл.
/// </summary>
public Task SendFileAsync(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null, CancellationToken ct = default)
=> Adapter.SendFileAsync(this.Update.Chat.Id, file, caption, captionFormat, ct);
/// <summary>
/// Отправить файл.
/// </summary>
public Task SendFileAsync(FileDescriptor file, string? caption = null, CancellationToken ct = default)
=> Adapter.SendFileAsync(this.Update.Chat.Id, file, caption, ct);
=> Adapter.SendFileAsync(this.Update.Chat.Id, file, caption, null, ct);
/// <summary>
/// Получить билдер альбомов.

20
BotPages.Core/Messaging/MessageBuilder.cs
View File

@@ -12,8 +12,8 @@ public sealed class MessageBuilder
private MessageFormat _format = MessageFormat.Plain;
private readonly List<List<InlineButton>> _inline = new();
private readonly List<List<ReplyButton>> _reply = new();
private readonly List<(FileDescriptor file, string? caption)> _files = new();
private readonly List<(FileDescriptor file, string? caption)> _album = 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;
@@ -86,16 +86,16 @@ public sealed class MessageBuilder
}
/// <summary>Добавить файл для отправки.</summary>
public MessageBuilder File(FileDescriptor file, string? caption = null)
public MessageBuilder File(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null)
{
_files.Add((file, caption));
_files.Add((file, caption, captionFormat));
return this;
}
/// <summary>Добавить файл в альбом.</summary>
public MessageBuilder Album(FileDescriptor file, string? caption = null)
public MessageBuilder Album(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null)
{
_album.Add((file, caption));
_album.Add((file, caption, captionFormat));
return this;
}
@@ -117,15 +117,15 @@ public sealed class MessageBuilder
}
// Файлы
foreach (var (file, caption) in _files)
await _ctx.SendFileAsync(file, caption, ct);
foreach (var (file, caption, captionFormat) in _files)
await _ctx.SendFileAsync(file, caption, captionFormat, ct);
// Альбом
if (_album.Count > 0)
{
var builder = _ctx.Albums;
foreach (var (file, caption) in _album)
builder.Add(file, caption);
foreach (var (file, caption, captionFormat) in _album)
builder.Add(file, caption, captionFormat);
await builder.SendAsync(ct);
}

14
BotPages.Telegram/TelegramAlbumBuilder.cs
View File

@@ -20,7 +20,7 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
private readonly PageContext _ctx;
private readonly ILogger _logger;
private readonly TelegramBotClient? _client;
private readonly List<(FileDescriptor file, string? caption)> _items = new();
private readonly List<(FileDescriptor file, string? caption, MessageFormat? captionFormat)> _items = new();
/// <summary>Создать билдер альбома.</summary>
public TelegramAlbumBuilder(TelegramAdapter adapter, PageContext ctx, ILogger logger, TelegramBotClient? client)
@@ -32,9 +32,9 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
}
/// <inheritdoc />
public IAlbumBuilder Add(FileDescriptor file, string? caption = null)
public IAlbumBuilder Add(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null)
{
_items.Add((file, caption));
_items.Add((file, caption, captionFormat));
return this;
}
@@ -52,13 +52,13 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
if (!_adapter.Capabilities.SupportsAlbums)
{
_logger.Log(LogLevel.Warn, "Albums not supported. Degraded to sequential sends.");
foreach (var (file, caption) in _items)
await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, ct);
foreach (var (file, caption, captionFormat) in _items)
await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct);
return;
}
var media = new List<IAlbumInputMedia>();
foreach (var (file, caption) in _items)
foreach (var (file, caption, captionFormat) in _items)
{
Stream? stream = null;
if (file.GetStreamAsync is not null)
@@ -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, ct);
await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct);
}
}