Доработан стартер адаптеров
All checks were successful
CI / build-test (push) Successful in 33s
Release / pack-and-publish (release) Successful in 38s

This commit is contained in:
2025-12-05 18:06:12 +03:00
parent 3b57f76579
commit a94327f0c8
12 changed files with 133 additions and 43 deletions

View File

@@ -0,0 +1,22 @@
using BotPages.Core;
namespace BotPages.Telegram;
/// <summary>
/// Расширения для <see cref="BotPagesApp"/>.
/// </summary>
public static class BotPagesAppExtension
{
/// <summary>
/// Добавление адаптера для телеграмм в <see cref="BotPages.Core.Abstractions.IMessengerAdapterFactory"/>
/// </summary>
/// <param name="app"></param>
/// <param name="token"></param>
/// <returns></returns>
public static BotPagesApp AddTelegramAdapter(this BotPagesApp app, string token)
{
var telegram = new TelegramAdapter(app.Logger, token);
app.AddAdapter(telegram.MessagerType, telegram);
return app;
}
}

View File

@@ -21,32 +21,44 @@ namespace BotPages.Telegram;
/// Адаптер для Telegram на базе Telegram.Bot.
/// Реализует отправку текста, кнопок, файлов, альбомов и прогресса.
/// </summary>
public sealed class TelegramAdapter : IMessengerAdapter
public sealed class TelegramAdapter : IMessangerAdapterSetup
{
private readonly ILogger _logger;
private TelegramBotClient? _client;
private string _token;
private string _messagerType;
/// <summary>Создать адаптер Telegram.</summary>
public TelegramAdapter(ILogger logger) => _logger = logger;
public TelegramAdapter(ILogger logger, string token)
{
_logger = logger;
_token = token;
_messagerType = "Telegram: " + Guid.NewGuid().ToString();
}
/// <summary>
///Идентификатор мессенджера / адаптера
/// </summary>
public string MessagerType => _messagerType;
/// <summary>
/// Запустить polling для приема обновлений от Telegram.
/// </summary>
public async Task StartPollingAsync(string token, Func<UpdateContext, Task> onUpdate, CancellationToken ct)
public async Task StartAdapterAsync(Func<UpdateContext, Task> onUpdate, CancellationToken ct)
{
_client = new TelegramBotClient(token);
_client = new TelegramBotClient(_token);
_client.StartReceiving(
updateHandler: async (_, update, ct2) =>
{
var mapped = TelegramUpdateMapper.Map(update, _client);
var mapped = TelegramUpdateMapper.Map(_messagerType, update, _client);
if (mapped is not null)
await onUpdate(mapped);
},
errorHandler: async (_, ex, ct2) =>
{
_logger.Log(LogLevel.Warn, "Telegram error.", ex);
_logger.Log(LogLevel.Warn, $"{_messagerType} error.", ex);
await Task.CompletedTask;
},
@@ -55,7 +67,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
var me = await _client.GetMe();
_logger.Log(LogLevel.Info, $"Telegram started: @{me.Username}");
_logger.Log(LogLevel.Info, $"{_messagerType} started: @{me.Username}");
return;
}
@@ -67,7 +79,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
{
if (_client is null)
{
_logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
_logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
return;
}
@@ -137,7 +149,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
{
if (_client is null)
{
_logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
_logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
return;
}
@@ -192,7 +204,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
{
if (_client is null)
{
_logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
_logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
return null;
}
@@ -216,7 +228,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
{
if (_client is null)
{
_logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
_logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
return;
}

View File

@@ -19,7 +19,7 @@ public static class TelegramUpdateMapper
/// <summary>
/// Маппинг Telegram Update в UpdateContext BotPages.
/// </summary>
public static UpdateContext Map(Update update, TelegramBotClient client)
public static UpdateContext Map(string MessagerType, Update update, TelegramBotClient client)
{
var chat = update.Message?.Chat ?? update.CallbackQuery?.Message?.Chat;
var user = update.Message?.From ?? update.CallbackQuery?.From;
@@ -131,7 +131,7 @@ public static class TelegramUpdateMapper
return new UpdateContext
{
MessengerType = "Telegram",
MessengerType = MessagerType,
User = userContext,
Chat = chatContext,
Text = text,