2 Commits

Author SHA1 Message Date
d97fcaaa20 Доработан формат подписи файлов
All checks were successful
CI / build-test (push) Successful in 35s
Release / pack-and-publish (release) Successful in 38s
2025-12-05 20:13:27 +03:00
308f1af33a Добавлен формат сообщения при отправке документа
Some checks failed
CI / build-test (push) Failing after 36s
Release / pack-and-publish (release) Failing after 34s
2025-12-05 20:04:42 +03:00
6 changed files with 62 additions and 25 deletions

View File

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

View File

@@ -21,7 +21,7 @@ public interface IMessengerAdapter
/// <summary> /// <summary>
/// Отправить файл в чат. /// Отправить файл в чат.
/// </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> /// <summary>
/// Создать билдер альбома для отправки медиагруппы. /// Создать билдер альбома для отправки медиагруппы.

View File

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

View File

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

View File

@@ -157,7 +157,7 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task SendFileAsync(string chatId, FileDescriptor file, string? caption, CancellationToken ct) public async Task SendFileAsync(string chatId, FileDescriptor file, string? caption, MessageFormat? captionFormat, CancellationToken ct)
{ {
if (_client is null) if (_client is null)
{ {
@@ -188,20 +188,51 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
inputFile = new InputFileId(file.Id); inputFile = new InputFileId(file.Id);
} }
var parseMode = ParseMode.None;
switch (captionFormat)
{
case MessageFormat.Html:
{
parseMode = ParseMode.Html;
break;
}
case MessageFormat.Plain:
{
parseMode = ParseMode.None;
break;
}
case MessageFormat.Markdown:
{
parseMode = ParseMode.MarkdownV2;
break;
}
case null:
{
parseMode = ParseMode.None;
break;
}
default:
{
_logger.Log(LogLevel.Warn, $"MessageFormat '{captionFormat}' not supported. Degraded to plain text.");
break;
}
}
// В зависимости от FileKind выбираем подходящий метод // В зависимости от FileKind выбираем подходящий метод
switch (file.Kind) switch (file.Kind)
{ {
case FileKind.Photo: case FileKind.Photo:
await _client.SendPhoto(long.Parse(chatId), inputFile, caption ?? "", cancellationToken: ct); await _client.SendPhoto(long.Parse(chatId), inputFile, caption ?? "", parseMode, cancellationToken: ct);
break; break;
case FileKind.Video: case FileKind.Video:
await _client.SendVideo(long.Parse(chatId), inputFile, caption: caption ?? "", cancellationToken: ct); await _client.SendVideo(long.Parse(chatId), inputFile, caption: caption ?? "", parseMode, cancellationToken: ct);
break; break;
case FileKind.Audio: case FileKind.Audio:
await _client.SendAudio(long.Parse(chatId), inputFile, caption ?? "", cancellationToken: ct); await _client.SendAudio(long.Parse(chatId), inputFile, caption ?? "", parseMode, cancellationToken: ct);
break; break;
default: default:
await _client.SendDocument(long.Parse(chatId), inputFile, caption ?? "", cancellationToken: ct); await _client.SendDocument(long.Parse(chatId), inputFile, caption ?? "", parseMode, cancellationToken: ct);
break; break;
} }
} }

View File

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