Add telegram sender
This commit is contained in:
parent
39876ebb54
commit
33074e99a0
@ -6,6 +6,15 @@
|
|||||||
<MicrosoftVersion>8.0.0</MicrosoftVersion>
|
<MicrosoftVersion>8.0.0</MicrosoftVersion>
|
||||||
<InsightTelegramBotVersion>0.16.0</InsightTelegramBotVersion>
|
<InsightTelegramBotVersion>0.16.0</InsightTelegramBotVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<ItemGroup Label="Nocr">
|
||||||
|
<PackageVersion Include="Nocr.TextMatcher.Async.Api.Contracts" Version="0.4.7" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup Label="Rebus">
|
||||||
|
<PackageVersion Include="Rebus" Version="8.2.2"/>
|
||||||
|
<PackageVersion Include="Rebus.ServiceProvider" Version="10.1.0"/>
|
||||||
|
<PackageVersion Include="Rebus.RabbitMq" Version="9.0.1"/>
|
||||||
|
<PackageVersion Include="Rebus.Serilog" Version="8.0.0"/>
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup Label="Insight.TelegramBot">
|
<ItemGroup Label="Insight.TelegramBot">
|
||||||
<PackageVersion Include="Insight.TelegramBot" Version="$(InsightTelegramBotVersion)"/>
|
<PackageVersion Include="Insight.TelegramBot" Version="$(InsightTelegramBotVersion)"/>
|
||||||
<PackageVersion Include="Insight.TelegramBot.Hosting.DependencyInjection" Version="$(InsightTelegramBotVersion)"/>
|
<PackageVersion Include="Insight.TelegramBot.Hosting.DependencyInjection" Version="$(InsightTelegramBotVersion)"/>
|
||||||
|
|||||||
@ -0,0 +1,26 @@
|
|||||||
|
using Insight.TelegramBot;
|
||||||
|
using Insight.TelegramBot.Models;
|
||||||
|
using Nocr.TextMatcher.Async.Api.Contracts;
|
||||||
|
using Rebus.Handlers;
|
||||||
|
|
||||||
|
namespace Nocr.TelegramClient.AppServices.Matches;
|
||||||
|
|
||||||
|
public class TextMatchMatchedHandler : IHandleMessages<TextMatchMatched>
|
||||||
|
{
|
||||||
|
private readonly IBot _bot;
|
||||||
|
|
||||||
|
public TextMatchMatchedHandler(IBot bot)
|
||||||
|
{
|
||||||
|
_bot = bot ?? throw new ArgumentNullException(nameof(bot));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Handle(TextMatchMatched message)
|
||||||
|
{
|
||||||
|
var textMessage = new TextMessage(58874635)
|
||||||
|
{
|
||||||
|
Text = $"[{message.PublishedDateTime:MM.dd.yyyy HH:mm:ss}] Найдено совпадение.\n @{message.ChatUsername} > {message.Text}"
|
||||||
|
};
|
||||||
|
|
||||||
|
await _bot.SendMessageAsync(textMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,9 +1,15 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<IsPackable>false</IsPackable>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Insight.TelegramBot" />
|
<PackageReference Include="Insight.TelegramBot" />
|
||||||
<PackageReference Include="Insight.TelegramBot.Handling" />
|
<PackageReference Include="Insight.TelegramBot.Handling" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
|
||||||
|
<PackageReference Include="Rebus" />
|
||||||
|
<PackageReference Include="Rebus.ServiceProvider" />
|
||||||
|
<PackageReference Include="Nocr.TextMatcher.Async.Api.Contracts" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Nocr.TelegramClient.AppServices.Matches;
|
||||||
|
using Rebus.Config;
|
||||||
|
|
||||||
namespace Nocr.TelegramClient.AppServices;
|
namespace Nocr.TelegramClient.AppServices;
|
||||||
|
|
||||||
@ -10,7 +12,8 @@ public static class ServiceCollectionExtensions
|
|||||||
throw new ArgumentNullException(nameof(services));
|
throw new ArgumentNullException(nameof(services));
|
||||||
|
|
||||||
// Add registrations here
|
// Add registrations here
|
||||||
|
services.AddRebusHandler<TextMatchMatchedHandler>();
|
||||||
|
|
||||||
return services;
|
return services;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
12
src/Nocr.TelegramClient.Core/Options/RebusRabbitMqOptions.cs
Normal file
12
src/Nocr.TelegramClient.Core/Options/RebusRabbitMqOptions.cs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
namespace Nocr.TelegramClient.Core.Options;
|
||||||
|
|
||||||
|
public sealed class RebusRabbitMqOptions
|
||||||
|
{
|
||||||
|
public string ConnectionString { get; set; }
|
||||||
|
|
||||||
|
public string InputQueueName { get; set; }
|
||||||
|
|
||||||
|
public string DirectExchangeName { get; set; }
|
||||||
|
|
||||||
|
public string TopicsExchangeName { get; set; }
|
||||||
|
}
|
||||||
@ -12,7 +12,7 @@ public class HostBuilderFactory<TStartup> where TStartup : class
|
|||||||
if (!string.IsNullOrWhiteSpace(baseDirectory))
|
if (!string.IsNullOrWhiteSpace(baseDirectory))
|
||||||
configurationBuilder.SetBasePath(baseDirectory);
|
configurationBuilder.SetBasePath(baseDirectory);
|
||||||
|
|
||||||
configurationBuilder.AddJsonFile("appsettings.protected.json", false);
|
configurationBuilder.AddJsonFile("appsettings.protected.json", true);
|
||||||
})
|
})
|
||||||
.ConfigureWebHostDefaults(host => { host.UseStartup<TStartup>(); })
|
.ConfigureWebHostDefaults(host => { host.UseStartup<TStartup>(); })
|
||||||
.UseSerilog((ctx, logBuilder) =>
|
.UseSerilog((ctx, logBuilder) =>
|
||||||
|
|||||||
@ -5,6 +5,11 @@ using Insight.TelegramBot.Hosting.Polling.ExceptionHandlers;
|
|||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Nocr.TelegramClient.AppServices;
|
using Nocr.TelegramClient.AppServices;
|
||||||
using Nocr.TelegramClient.Core.Dates;
|
using Nocr.TelegramClient.Core.Dates;
|
||||||
|
using Nocr.TelegramClient.Core.Options;
|
||||||
|
using Rebus.Bus;
|
||||||
|
using Rebus.Config;
|
||||||
|
using Rebus.Routing.TypeBased;
|
||||||
|
using Rebus.Serialization.Json;
|
||||||
|
|
||||||
namespace Nocr.TelegramClient.Host.Infrastructure;
|
namespace Nocr.TelegramClient.Host.Infrastructure;
|
||||||
|
|
||||||
@ -30,9 +35,24 @@ public class Startup
|
|||||||
.WithPolling(polling => polling.WithExceptionHandler<LoggingPollingExceptionHandler>()));
|
.WithPolling(polling => polling.WithExceptionHandler<LoggingPollingExceptionHandler>()));
|
||||||
services.AddTelegramBotHandling(typeof(BotClient).Assembly);
|
services.AddTelegramBotHandling(typeof(BotClient).Assembly);
|
||||||
services.AddAppServices();
|
services.AddAppServices();
|
||||||
|
|
||||||
|
services.Configure<RebusRabbitMqOptions>(Configuration.GetSection(nameof(RebusRabbitMqOptions)));
|
||||||
|
services.AddRebus((builder, ctx) =>
|
||||||
|
builder.Transport(t =>
|
||||||
|
{
|
||||||
|
var rebusOptions = ctx.GetRequiredService<IOptions<RebusRabbitMqOptions>>().Value;
|
||||||
|
t.UseRabbitMq(rebusOptions.ConnectionString, rebusOptions.InputQueueName)
|
||||||
|
.DefaultQueueOptions(queue => queue.SetDurable(true))
|
||||||
|
.ExchangeNames(rebusOptions.DirectExchangeName, rebusOptions.TopicsExchangeName);
|
||||||
|
})
|
||||||
|
.Serialization(s => s.UseSystemTextJson())
|
||||||
|
.Logging(l => l.Serilog())
|
||||||
|
.Routing(r => r.TypeBased()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Configure(IApplicationBuilder app)
|
public void Configure(IApplicationBuilder app)
|
||||||
{
|
{
|
||||||
|
var bus = app.ApplicationServices.GetRequiredService<IBus>();
|
||||||
|
bus.Advanced.Topics.Subscribe("nocr.text.matcher.matched").GetAwaiter().GetResult();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -9,15 +9,20 @@
|
|||||||
<PackageReference Include="Serilog.AspNetCore" />
|
<PackageReference Include="Serilog.AspNetCore" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup Label="Rebus">
|
||||||
<ProjectReference Include="..\Nocr.TelegramClient.AppServices\Nocr.TelegramClient.AppServices.csproj" />
|
<PackageReference Include="Rebus.RabbitMq" />
|
||||||
<ProjectReference Include="..\Nocr.TelegramClient.Core\Nocr.TelegramClient.Core.csproj" />
|
<PackageReference Include="Rebus.Serilog" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="..\..\.dockerignore">
|
<ProjectReference Include="..\Nocr.TelegramClient.AppServices\Nocr.TelegramClient.AppServices.csproj" />
|
||||||
<Link>.dockerignore</Link>
|
<ProjectReference Include="..\Nocr.TelegramClient.Core\Nocr.TelegramClient.Core.csproj" />
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="..\..\.dockerignore">
|
||||||
|
<Link>.dockerignore</Link>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -8,5 +8,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"RebusRabbitMqOptions": {
|
||||||
|
"ConnectionString": "amqp://admin:admin@localhost:5672/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"RebusRabbitMqOptions": {
|
||||||
|
"ConnectionString": "amqp://admin:admin@nocr-rabbitmq:5672/"
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -8,5 +8,10 @@
|
|||||||
"System.Net.Http.HttpClient": "Warning"
|
"System.Net.Http.HttpClient": "Warning"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"RebusRabbitMqOptions": {
|
||||||
|
"InputQueueName": "nocr.telegram.client.queue",
|
||||||
|
"DirectExchangeName": "nocr.direct",
|
||||||
|
"TopicsExchangeName": "nocr.topics"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user