Skip to content

Commit 7ba6b60

Browse files
devgopherIgor Evdokimov
devgopher
authored and
Igor Evdokimov
committed
- code cleanup for samples
1 parent c85a363 commit 7ba6b60

35 files changed

+698
-623
lines changed

‎Pay.Sample.Telegram/Commands/Processors/InfoCommandProcessor.cs

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
using System.Reflection;
21
using Botticelli.Client.Analytics;
32
using Botticelli.Framework.Commands.Processors;
43
using Botticelli.Framework.Commands.Validators;
54
using Botticelli.Framework.Controls.Parsers;
6-
using Botticelli.Framework.SendOptions;
75
using Botticelli.Shared.API.Client.Requests;
86
using Botticelli.Shared.ValueObjects;
97
using FluentValidation;
@@ -13,20 +11,32 @@ namespace TelegramPayBot.Commands.Processors;
1311
public class InfoCommandProcessor<TReplyMarkup> : CommandProcessor<InfoCommand> where TReplyMarkup : class
1412
{
1513
public InfoCommandProcessor(ILogger<InfoCommandProcessor<TReplyMarkup>> logger,
16-
ICommandValidator<InfoCommand> commandValidator,
17-
MetricsProcessor metricsProcessor,
18-
ILayoutSupplier<TReplyMarkup> layoutSupplier,
19-
ILayoutParser layoutParser,
20-
IValidator<Message> messageValidator)
21-
: base(logger, commandValidator, metricsProcessor, messageValidator)
14+
ICommandValidator<InfoCommand> commandValidator,
15+
MetricsProcessor metricsProcessor,
16+
ILayoutSupplier<TReplyMarkup> layoutSupplier,
17+
ILayoutParser layoutParser,
18+
IValidator<Message> messageValidator)
19+
: base(logger,
20+
commandValidator,
21+
metricsProcessor,
22+
messageValidator)
2223
{
2324
}
2425

25-
protected override Task InnerProcessContact(Message message, CancellationToken token) => Task.CompletedTask;
26+
protected override Task InnerProcessContact(Message message, CancellationToken token)
27+
{
28+
return Task.CompletedTask;
29+
}
2630

27-
protected override Task InnerProcessPoll(Message message, CancellationToken token) => Task.CompletedTask;
31+
protected override Task InnerProcessPoll(Message message, CancellationToken token)
32+
{
33+
return Task.CompletedTask;
34+
}
2835

29-
protected override Task InnerProcessLocation(Message message, CancellationToken token) => Task.CompletedTask;
36+
protected override Task InnerProcessLocation(Message message, CancellationToken token)
37+
{
38+
return Task.CompletedTask;
39+
}
3040

3141
protected override async Task InnerProcess(Message message, CancellationToken token)
3242
{

‎Pay.Sample.Telegram/Commands/Processors/SendInvoiceCommandProcessor.cs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System.Reflection;
21
using Botticelli.Client.Analytics;
32
using Botticelli.Framework.Commands.Processors;
43
using Botticelli.Framework.Commands.Validators;
5-
using Botticelli.Framework.SendOptions;
64
using Botticelli.Pay.Message;
75
using Botticelli.Pay.Models;
86
using Botticelli.Pay.Utils;
@@ -23,16 +21,28 @@ public SendInvoiceCommandProcessor(ILogger<SendInvoiceCommandProcessor<TReplyMar
2321
MetricsProcessor metricsProcessor,
2422
IValidator<Message> messageValidator,
2523
IOptionsMonitor<PaySettings> paySettingsAccessor)
26-
: base(logger, commandValidator, metricsProcessor, messageValidator)
24+
: base(logger,
25+
commandValidator,
26+
metricsProcessor,
27+
messageValidator)
2728
{
2829
_paySettingsAccessor = paySettingsAccessor;
2930
}
3031

31-
protected override Task InnerProcessContact(Message message, CancellationToken token) => Task.CompletedTask;
32+
protected override Task InnerProcessContact(Message message, CancellationToken token)
33+
{
34+
return Task.CompletedTask;
35+
}
3236

33-
protected override Task InnerProcessPoll(Message message, CancellationToken token) => Task.CompletedTask;
37+
protected override Task InnerProcessPoll(Message message, CancellationToken token)
38+
{
39+
return Task.CompletedTask;
40+
}
3441

35-
protected override Task InnerProcessLocation(Message message, CancellationToken token) => Task.CompletedTask;
42+
protected override Task InnerProcessLocation(Message message, CancellationToken token)
43+
{
44+
return Task.CompletedTask;
45+
}
3646

3747
protected override async Task InnerProcess(Message message, CancellationToken token)
3848
{

‎Pay.Sample.Telegram/Handlers/PayPreCheckoutHandler.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ namespace TelegramPayBot.Handlers;
44

55
public class PayPreCheckoutHandler : IPreCheckoutHandler
66
{
7-
87
}

‎Pay.Sample.Telegram/Pay.Sample.Telegram.csproj

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<RootNamespace>TelegramPayBot</RootNamespace>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<RootNamespace>TelegramPayBot</RootNamespace>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11"/>
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
13-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11"/>
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
13+
</ItemGroup>
1414

15-
<ItemGroup>
16-
<ProjectReference Include="..\Botticelli.Framework.Telegram\Botticelli.Framework.Telegram.csproj" />
17-
<ProjectReference Include="..\Botticelli.Pay.Telegram\Botticelli.Pay.Telegram.csproj" />
18-
<ProjectReference Include="..\Botticelli.Pay\Botticelli.Pay.csproj" />
19-
</ItemGroup>
15+
<ItemGroup>
16+
<ProjectReference Include="..\Botticelli.Framework.Telegram\Botticelli.Framework.Telegram.csproj"/>
17+
<ProjectReference Include="..\Botticelli.Pay.Telegram\Botticelli.Pay.Telegram.csproj"/>
18+
<ProjectReference Include="..\Botticelli.Pay\Botticelli.Pay.csproj"/>
19+
</ItemGroup>
2020

2121
</Project>

‎Samples/Ai.ChatGpt.Sample.Vk/Ai.ChatGpt.Sample.Vk.csproj

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Version>0.7.0</Version>
8-
<Company>Botticelli</Company>
9-
<Copyright>Igor Evdokimov</Copyright>
10-
<PackageProjectUrl>https://github.com/devgopher/botticelli</PackageProjectUrl>
11-
<PackageIcon>logo.jpg</PackageIcon>
12-
<RepositoryUrl>https://github.com/devgopher/botticelli</RepositoryUrl>
13-
<RootNamespace>VkAiChatGptSample</RootNamespace>
14-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Version>0.7.0</Version>
8+
<Company>Botticelli</Company>
9+
<Copyright>Igor Evdokimov</Copyright>
10+
<PackageProjectUrl>https://github.com/devgopher/botticelli</PackageProjectUrl>
11+
<PackageIcon>logo.jpg</PackageIcon>
12+
<RepositoryUrl>https://github.com/devgopher/botticelli</RepositoryUrl>
13+
<RootNamespace>VkAiChatGptSample</RootNamespace>
14+
</PropertyGroup>
1515

16-
<ItemGroup>
17-
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.14"/>
18-
</ItemGroup>
16+
<ItemGroup>
17+
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.14"/>
18+
</ItemGroup>
1919

20-
<ItemGroup>
21-
<ProjectReference Include="..\..\Botticelli.AI.ChatGpt\Botticelli.AI.ChatGpt.csproj"/>
22-
<ProjectReference Include="..\..\Botticelli.Framework.Vk\Botticelli.Framework.Vk.Messages.csproj"/>
23-
<ProjectReference Include="..\Ai.Common.Sample\Ai.Common.Sample.csproj" />
24-
</ItemGroup>
20+
<ItemGroup>
21+
<ProjectReference Include="..\..\Botticelli.AI.ChatGpt\Botticelli.AI.ChatGpt.csproj"/>
22+
<ProjectReference Include="..\..\Botticelli.Framework.Vk\Botticelli.Framework.Vk.Messages.csproj"/>
23+
<ProjectReference Include="..\Ai.Common.Sample\Ai.Common.Sample.csproj"/>
24+
</ItemGroup>
2525

26-
<ItemGroup>
27-
<Folder Include="Data\"/>
28-
</ItemGroup>
26+
<ItemGroup>
27+
<Folder Include="Data\"/>
28+
</ItemGroup>
2929

30-
<ItemGroup>
31-
<Content Update="appsettings.json">
32-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33-
</Content>
34-
</ItemGroup>
30+
<ItemGroup>
31+
<Content Update="appsettings.json">
32+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33+
</Content>
34+
</ItemGroup>
3535

36-
<ItemGroup>
37-
<None Include="..\nlog.config">
38-
<Link>nlog.config</Link>
39-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40-
</None>
41-
</ItemGroup>
36+
<ItemGroup>
37+
<None Include="..\nlog.config">
38+
<Link>nlog.config</Link>
39+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40+
</None>
41+
</ItemGroup>
4242

4343
</Project>

‎Samples/Ai.ChatGpt.Sample.Vk/Program.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
var builder = WebApplication.CreateBuilder(args);
1616

1717
var settings = builder.Configuration
18-
.GetSection(nameof(SampleSettings))
19-
.Get<SampleSettings>();
18+
.GetSection(nameof(SampleSettings))
19+
.Get<SampleSettings>();
2020

2121
builder.Services.AddVkBot(builder.Configuration)
22-
.AddLogging(cfg => cfg.AddNLog())
23-
.AddChatGptProvider(builder.Configuration)
24-
.AddScoped<ICommandValidator<AiCommand>, PassValidator<AiCommand>>()
25-
.AddSingleton<AiHandler>()
26-
.UsePassBusAgent<IBot<VkBot>, AiHandler>()
27-
.UsePassBusClient<IBot<VkBot>>()
28-
.AddBotCommand<AiCommand, AiCommandProcessor<VkKeyboardMarkup>, PassValidator<AiCommand>>();
22+
.AddLogging(cfg => cfg.AddNLog())
23+
.AddChatGptProvider(builder.Configuration)
24+
.AddScoped<ICommandValidator<AiCommand>, PassValidator<AiCommand>>()
25+
.AddSingleton<AiHandler>()
26+
.UsePassBusAgent<IBot<VkBot>, AiHandler>()
27+
.UsePassBusClient<IBot<VkBot>>()
28+
.AddBotCommand<AiCommand, AiCommandProcessor<VkKeyboardMarkup>, PassValidator<AiCommand>>();
2929

3030
var app = builder.Build();
3131

‎Samples/Ai.Common.Sample/Ai.Common.Sample.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<RootNamespace>AiSample.Common</RootNamespace>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<RootNamespace>AiSample.Common</RootNamespace>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<PackageReference Include="Telegram.Bot" Version="19.0.0"/>
12-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="Telegram.Bot" Version="19.0.0"/>
12+
</ItemGroup>
1313

14-
<ItemGroup>
15-
<ProjectReference Include="..\..\Botticelli.AI\Botticelli.AI.csproj"/>
16-
<ProjectReference Include="..\..\Botticelli.Framework.Controls\Botticelli.Framework.Controls.csproj"/>
17-
<ProjectReference Include="..\..\Botticelli.Framework\Botticelli.Framework.csproj"/>
18-
</ItemGroup>
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\Botticelli.AI\Botticelli.AI.csproj"/>
16+
<ProjectReference Include="..\..\Botticelli.Framework.Controls\Botticelli.Framework.Controls.csproj"/>
17+
<ProjectReference Include="..\..\Botticelli.Framework\Botticelli.Framework.csproj"/>
18+
</ItemGroup>
1919

2020
</Project>
2121

‎Samples/Ai.Common.Sample/AiCommandProcessor.cs

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ public class AiCommandProcessor<TReplyMarkup> : CommandProcessor<AiCommand> wher
2020
private readonly IEventBusClient _bus;
2121

2222
public AiCommandProcessor(ILogger<AiCommandProcessor<TReplyMarkup>> logger,
23-
ICommandValidator<AiCommand> commandValidator,
24-
MetricsProcessor metricsProcessor,
25-
IEventBusClient bus,
26-
ILayoutSupplier<TReplyMarkup> layoutSupplier,
27-
IValidator<Message> messageValidator)
28-
: base(logger, commandValidator, metricsProcessor, messageValidator)
23+
ICommandValidator<AiCommand> commandValidator,
24+
MetricsProcessor metricsProcessor,
25+
IEventBusClient bus,
26+
ILayoutSupplier<TReplyMarkup> layoutSupplier,
27+
IValidator<Message> messageValidator)
28+
: base(logger,
29+
commandValidator,
30+
metricsProcessor,
31+
messageValidator)
2932
{
3033
_bus = bus;
3134
var responseLayout = new AiLayout();
@@ -36,36 +39,39 @@ public AiCommandProcessor(ILogger<AiCommandProcessor<TReplyMarkup>> logger,
3639
_bus.OnReceived += async (sender, response) =>
3740
{
3841
await Bot.SendMessageAsync(new SendMessageRequest(response.Uid)
39-
{
40-
Message = response.Message,
41-
ExpectPartialResponse = response.IsPartial,
42-
SequenceNumber = response.SequenceNumber,
43-
IsFinal = response.IsFinal
44-
},
45-
options,
46-
CancellationToken.None);
42+
{
43+
Message = response.Message,
44+
ExpectPartialResponse = response.IsPartial,
45+
SequenceNumber = response.SequenceNumber,
46+
IsFinal = response.IsFinal
47+
},
48+
options,
49+
CancellationToken.None);
4750
};
4851
}
4952

5053
protected override async Task InnerProcessLocation(Message message, CancellationToken token)
5154
{
5255
message.Body =
53-
$"{$"Coordinates {message.Location.Latitude:##.#####}".Replace(",", ".")},{$"{message.Location.Longitude:##.#####}".Replace(",", ".")}";
56+
$"{$"Coordinates {message.Location.Latitude:##.#####}".Replace(",", ".")},{$"{message.Location.Longitude:##.#####}".Replace(",", ".")}";
5457
await InnerProcess(message, token);
5558
}
5659

5760

58-
protected override async Task InnerProcess(Message message, CancellationToken token) =>
61+
protected override async Task InnerProcess(Message message, CancellationToken token)
62+
{
5963
await _bus.Send(new SendMessageRequest(message.Uid)
60-
{
61-
Message = new AiMessage(message.Uid)
62-
{
63-
ChatIds = message.ChatIds,
64-
Subject = string.Empty,
65-
Body = message.Body?.GetArguments(),
66-
Attachments = null,
67-
From = message.From,
68-
ForwardedFrom = message.ForwardedFrom
69-
}
70-
}, token);
64+
{
65+
Message = new AiMessage(message.Uid)
66+
{
67+
ChatIds = message.ChatIds,
68+
Subject = string.Empty,
69+
Body = message.Body?.GetArguments(),
70+
Attachments = null,
71+
From = message.From,
72+
ForwardedFrom = message.ForwardedFrom
73+
}
74+
},
75+
token);
76+
}
7177
}

‎Samples/Ai.Common.Sample/Handlers/AiHandler.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ public async Task Handle(SendMessageRequest input, CancellationToken token)
2424
try
2525
{
2626
await _provider.SendAsync(new AiMessage(input.Uid)
27-
{
28-
ChatIds = input.Message.ChatIds,
29-
Body = input.Message.Body,
30-
Subject = input.Message.Subject,
31-
ChatIdInnerIdLinks = input.Message.ChatIdInnerIdLinks,
32-
ReplyToMessageUid = input.Uid
33-
},
34-
token);
27+
{
28+
ChatIds = input.Message.ChatIds,
29+
Body = input.Message.Body,
30+
Subject = input.Message.Subject,
31+
ChatIdInnerIdLinks = input.Message.ChatIdInnerIdLinks,
32+
ReplyToMessageUid = input.Uid
33+
},
34+
token);
3535
}
3636
catch (Exception ex)
3737
{

0 commit comments

Comments
 (0)