Jetsparrow/karmabot
1
0
Fork 0
mirror of https://github.com/Jetsparrow/karmabot.git synced 2026-04-26 06:05:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: Jetsparrow:bd2859913f27b8388a55a4995d6ddbf97d87f8d3
Branches Tags
Jetsparrow:master
Jetsparrow:dependabot/nuget/JetKarmaBot/Newtonsoft.Json-13.0.2
Jetsparrow:jetbotlib
Jetsparrow:custom-awards
Jetsparrow:v1.0.0
..
compare: Jetsparrow:2cc286ad9cc6cbf56748c60a7c0b21336aafd740
Branches Tags
Jetsparrow:master
Jetsparrow:dependabot/nuget/JetKarmaBot/Newtonsoft.Json-13.0.2
Jetsparrow:jetbotlib
Jetsparrow:custom-awards
Jetsparrow:v1.0.0

No commits in common. "bd2859913f27b8388a55a4995d6ddbf97d87f8d3" and "2cc286ad9cc6cbf56748c60a7c0b21336aafd740" have entirely different histories.
bd2859913f ... 2cc286ad9c

4 changed files with 19 additions and 21 deletions
Show Stats Expand all files Collapse all files

10
JetKarmaBot/Config.cs
View File

@ -12,7 +12,15 @@ public class Config : ConfigBase
public string ApiKey { get; private set; } public string ApiKey { get; private set; }
public string ConnectionString { get; private set; } public string ConnectionString { get; private set; }
public string Proxy { get; private set; } public class ProxySettings
{
public string Url { get; private set; }
public int Port { get; private set; }
public string Login { get; private set; }
public string Password { get; private set; }
}
public ProxySettings Proxy { get; private set; }
public class TimeoutConfig public class TimeoutConfig
{ {
public int DebtLimitSeconds { get; private set; } = 60 * 60 * 2; public int DebtLimitSeconds { get; private set; } = 60 * 60 * 2;

18
JetKarmaBot/JetKarmaBot.cs
View File

@ -3,8 +3,7 @@ using JetKarmaBot.Models;
using JetKarmaBot.Services; using JetKarmaBot.Services;
using JetKarmaBot.Services.Handling; using JetKarmaBot.Services.Handling;
using NLog; using NLog;
using System.Net;
using System.Net.Http;
using Telegram.Bot; using Telegram.Bot;
using Telegram.Bot.Polling; using Telegram.Bot.Polling;
using Telegram.Bot.Types; using Telegram.Bot.Types;
@ -33,17 +32,8 @@ public class JetKarmaBot : IDisposable
{ {
using (KarmaContext db = Db.GetContext()) using (KarmaContext db = Db.GetContext())
await db.Database.EnsureCreatedAsync(); await db.Database.EnsureCreatedAsync();
var httpClientHandler = new HttpClientHandler(); Client = new TelegramBotClient(Config.ApiKey);
if (Config.Proxy is string url)
{
httpClientHandler.Proxy = new WebProxy(url);
httpClientHandler.UseProxy = true;
}
var httpClient = new HttpClient(httpClientHandler);
Client = new TelegramBotClient(Config.ApiKey, httpClient);
Container.AddInstance(Client); Container.AddInstance(Client);
timeoutWaitTaskToken = new CancellationTokenSource(); timeoutWaitTaskToken = new CancellationTokenSource();
@ -62,7 +52,7 @@ public class JetKarmaBot : IDisposable
public async Task Stop() public async Task Stop()
{ {
if (stopped) return; if (stopped) return;
Client?.Close(); Client?.CloseAsync();
timeoutWaitTaskToken?.Cancel(); timeoutWaitTaskToken?.Cancel();
try try
{ {

10
JetKarmaBot/JetKarmaBot.csproj
View File

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageReference Include="Telegram.Bot" Version="22.9.6" /> <PackageReference Include="Telegram.Bot" Version="22.0.2" />
<PackageReference Include="NLog" Version="6.1.2" /> <PackageReference Include="NLog" Version="5.3.4" />
<ProjectReference Include="..\perfusion\Perfusion\Perfusion.csproj" /> <ProjectReference Include="..\perfusion\Perfusion\Perfusion.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
JetKarmaBot/Services/Handling/CommandRouter.cs
View File

@ -18,7 +18,7 @@ public class ChatCommandRouter : IRequestHandler
public async Task Start() public async Task Start()
{ {
Me = await Client.GetMe(); Me = await Client.GetMeAsync();
} }
public Task Handle(RequestContext ctx, Func<RequestContext, Task> next) public Task Handle(RequestContext ctx, Func<RequestContext, Task> next)