Skip to content

Commit 53416ac

Browse files
author
GitHub Copilot
committed
refactor
1 parent af38192 commit 53416ac

20 files changed

Lines changed: 23 additions & 44 deletions

Src/TeleFrame/Application/MiddlewareRegistry.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Microsoft.Extensions.DependencyInjection;
21
using TeleFrame.Middlewares.Abstractions;
32

43
namespace TeleFrame.Application;

Src/TeleFrame/Application/TelegramBotApplication.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Microsoft.Extensions.Configuration;
2-
using Microsoft.Extensions.DependencyInjection;
32
using Microsoft.Extensions.Hosting;
43
using TeleFrame.Middlewares.Abstractions;
54
using Telegram.Bot.Polling;

Src/TeleFrame/Application/UpdateProcessor.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Microsoft.Extensions.DependencyInjection;
21
using TeleFrame.Middlewares.Abstractions;
3-
using TeleFrame.Services;
42

53
namespace TeleFrame.Application;
64

@@ -11,7 +9,7 @@ internal class UpdateProcessor(
119
public async Task ProcessAsync(IAsyncEnumerable<Update> updates, CancellationToken ct)
1210
{
1311
var logger = services.GetRequiredService<ILogger<UpdateProcessor>>();
14-
12+
1513
await foreach (var update in updates.WithCancellation(ct))
1614
try
1715
{

Src/TeleFrame/ApplicationBuilder/TelegramBotApplicationBuilder.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using Microsoft.Extensions.Configuration;
2-
using Microsoft.Extensions.DependencyInjection;
32
using Microsoft.Extensions.Diagnostics.Metrics;
43
using Microsoft.Extensions.Hosting;
54
using Microsoft.Extensions.Options;
6-
using TeleFrame.Services;
75
using TeleFrame.Services.StateManager;
86
using Telegram.Bot.Polling;
97

Src/TeleFrame/GlobalUsings.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
global using TeleFrame.Services;
1313
global using Telegram.Bot;
1414
global using Telegram.Bot.Types;
15-
global using Telegram.Bot.Requests;
15+
global using Telegram.Bot.Requests;
16+
global using Telegram.Bot.Types.Enums;

Src/TeleFrame/Middlewares/Abstractions/IUpdateMiddleware.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using TeleFrame.Services;
2-
31
namespace TeleFrame.Middlewares.Abstractions;
42

53
public interface IUpdateMiddleware

Src/TeleFrame/Middlewares/Abstractions/UpdateMiddlewareDelegates.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using TeleFrame.Services;
2-
31
namespace TeleFrame.Middlewares.Abstractions;
42

53
public delegate Task UpdateMiddlewareDelegate(UpdateContext context, CancellationToken cancellationToken);

Src/TeleFrame/Middlewares/UpdateLoggingMiddleware.cs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,32 @@
1-
using Microsoft.Extensions.DependencyInjection;
21
using TeleFrame.Middlewares.Abstractions;
3-
using TeleFrame.Services;
42

53
namespace TeleFrame.Middlewares;
64

7-
public class UpdateLoggingMiddleware(ILogger<UpdateLoggingMiddleware> logger) : IUpdateMiddleware
5+
public partial class UpdateLoggingMiddleware(ILogger<UpdateLoggingMiddleware> logger) : IUpdateMiddleware
86
{
97
public Task InvokeAsync(UpdateContext context, UpdateMiddlewareDelegate next,
108
CancellationToken cancellationToken)
119
{
1210
var update = context.Update;
1311

14-
logger.LogInformation("Received Update Type : {Type}", update.Type);
15-
if (update.Message?.Text is not null)
16-
logger.LogInformation("Received Message : {Message}", update.Message.Text);
12+
LogReceivedUpdateType(logger, update.Type);
13+
14+
if (update.Message?.Text is null) return next(context, cancellationToken);
15+
16+
LogReceivedMessageMessage(logger, update.Message.Text);
17+
LogReceivedMessageTypeMessage(logger, update.Message.Type);
18+
1719
return next(context, cancellationToken);
1820
}
21+
22+
[LoggerMessage(LogLevel.Information, "Received Update Type : {Type}")]
23+
static partial void LogReceivedUpdateType(ILogger<UpdateLoggingMiddleware> logger, UpdateType type);
24+
25+
[LoggerMessage(LogLevel.Information, "Received Message : {Message}")]
26+
static partial void LogReceivedMessageMessage(ILogger<UpdateLoggingMiddleware> logger, string message);
27+
28+
[LoggerMessage(LogLevel.Information, "Received Message Type: {Message}")]
29+
static partial void LogReceivedMessageTypeMessage(ILogger<UpdateLoggingMiddleware> logger, MessageType message);
1930
}
2031

2132
public static class UpdateLoggingMiddlewareExtensions

Src/TeleFrame/Options/OptionsExtensions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Microsoft.Extensions.Configuration;
2-
using Microsoft.Extensions.DependencyInjection;
32

43
namespace TeleFrame.Options;
54

@@ -14,7 +13,7 @@ internal static class Options
1413
/// <param name="configuration">configuration</param>
1514
/// <typeparam name="TOptions">options type</typeparam>
1615
/// <returns></returns>
17-
public IServiceCollection BindOptions<TOptions>(IConfiguration configuration)
16+
public IServiceCollection BindOptions<TOptions>(IConfiguration configuration)
1817
where TOptions : class
1918
{
2019
services.AddOptions<TOptions>()

Src/TeleFrame/Results/ITelegramResult.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using TeleFrame.Services;
2-
31
namespace TeleFrame.Results;
42

53
public interface ITelegramResult

0 commit comments

Comments
 (0)