++
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
# Переменные ниже подхватывает docker-compose; в контейнере они маппятся в TELEGRAM__BotToken и т.д.
|
||||||
TELEGRAM_BOT_TOKEN=PASTE_TELEGRAM_BOT_TOKEN
|
TELEGRAM_BOT_TOKEN=PASTE_TELEGRAM_BOT_TOKEN
|
||||||
# Для каналов часто это ID вида -1001234567890
|
# Для каналов часто это ID вида -1001234567890
|
||||||
TELEGRAM_CHANNEL_ID=-1001234567890
|
TELEGRAM_CHANNEL_ID=-1001234567890
|
||||||
|
|||||||
+8
-6
@@ -7,12 +7,14 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file: .env
|
env_file: .env
|
||||||
environment:
|
environment:
|
||||||
# TELEGRAM__BOT_TOKEN: ${TELEGRAM_BOT_TOKEN}
|
# Имена ключей должны совпадать с свойствами Options (BotToken, ChannelId, ...),
|
||||||
# TELEGRAM__CHANNEL_ID: ${TELEGRAM_CHANNEL_ID}
|
# иначе TELEGRAM__BOT_TOKEN попадёт в конфиг как BOT_TOKEN и не забиндится.
|
||||||
# VK__ACCESS_TOKEN: ${VK_ACCESS_TOKEN}
|
TELEGRAM__BotToken: ${TELEGRAM_BOT_TOKEN}
|
||||||
# VK__GROUP_ID: ${VK_GROUP_ID}
|
TELEGRAM__ChannelId: ${TELEGRAM_CHANNEL_ID}
|
||||||
# VK__API_VERSION: ${VK_API_VERSION:-5.199}
|
VK__AccessToken: ${VK_ACCESS_TOKEN}
|
||||||
DB__PATH: /data/mapping.sqlite
|
VK__GroupId: ${VK_GROUP_ID}
|
||||||
|
VK__ApiVersion: ${VK_API_VERSION:-5.199}
|
||||||
|
DB__Path: /data/mapping.sqlite
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 17
|
||||||
|
VisualStudioVersion = 17.14.36705.20 d17.14
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telegram2VkBot", "Telegram2VkBot\Telegram2VkBot.csproj", "{4B1C71A4-EEF2-2331-09E5-969F4CE06FCB}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{4B1C71A4-EEF2-2331-09E5-969F4CE06FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{4B1C71A4-EEF2-2331-09E5-969F4CE06FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{4B1C71A4-EEF2-2331-09E5-969F4CE06FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{4B1C71A4-EEF2-2331-09E5-969F4CE06FCB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {9C974078-6B64-4FB0-9133-306B105C3385}
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
@@ -17,7 +17,6 @@ public sealed class ForwardWorker : BackgroundService
|
|||||||
public ForwardWorker(
|
public ForwardWorker(
|
||||||
IOptions<TelegramOptions> telegram,
|
IOptions<TelegramOptions> telegram,
|
||||||
IOptions<VkOptions> vk,
|
IOptions<VkOptions> vk,
|
||||||
IOptions<DbOptions> db,
|
|
||||||
VkApiClient vkApi,
|
VkApiClient vkApi,
|
||||||
MappingRepository repo,
|
MappingRepository repo,
|
||||||
ILogger<ForwardWorker> logger)
|
ILogger<ForwardWorker> logger)
|
||||||
@@ -32,13 +31,13 @@ public sealed class ForwardWorker : BackgroundService
|
|||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(_telegram.BotToken))
|
if (string.IsNullOrWhiteSpace(_telegram.BotToken))
|
||||||
throw new ArgumentException("TELEGRAM__BOT_TOKEN is empty");
|
throw new ArgumentException("TELEGRAM__BotToken (или TELEGRAM:BotToken) пуст — проверьте .env / переменные окружения.");
|
||||||
if (_telegram.ChannelId == 0)
|
if (_telegram.ChannelId == 0)
|
||||||
throw new ArgumentException("TELEGRAM__CHANNEL_ID must be non-zero (example: -1001234567890)");
|
throw new ArgumentException("TELEGRAM__ChannelId должен быть ненулевым (пример: -1001234567890).");
|
||||||
if (string.IsNullOrWhiteSpace(_vk.AccessToken))
|
if (string.IsNullOrWhiteSpace(_vk.AccessToken))
|
||||||
throw new ArgumentException("VK__ACCESS_TOKEN is empty");
|
throw new ArgumentException("VK__AccessToken пуст — проверьте .env / переменные окружения.");
|
||||||
if (_vk.GroupId == 0)
|
if (_vk.GroupId == 0)
|
||||||
throw new ArgumentException("VK__GROUP_ID must be non-zero (community id without minus)");
|
throw new ArgumentException("VK__GroupId должен быть ненулевым (id сообщества без минуса).");
|
||||||
|
|
||||||
_logger.LogInformation("Init database");
|
_logger.LogInformation("Init database");
|
||||||
await _repo.InitializeAsync(stoppingToken);
|
await _repo.InitializeAsync(stoppingToken);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Microsoft.Data.Sqlite;
|
using Microsoft.Data.Sqlite;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
namespace Telegram2VkBot;
|
namespace Telegram2VkBot;
|
||||||
|
|
||||||
@@ -7,9 +8,9 @@ public sealed class MappingRepository
|
|||||||
private readonly DbOptions _dbOptions;
|
private readonly DbOptions _dbOptions;
|
||||||
private readonly ILogger<MappingRepository> _logger;
|
private readonly ILogger<MappingRepository> _logger;
|
||||||
|
|
||||||
public MappingRepository(DbOptions dbOptions, ILogger<MappingRepository> logger)
|
public MappingRepository(IOptions<DbOptions> dbOptions, ILogger<MappingRepository> logger)
|
||||||
{
|
{
|
||||||
_dbOptions = dbOptions;
|
_dbOptions = dbOptions.Value;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,9 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Update="appsettings.json">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9" />
|
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.Hosting.Lifetime": "Information"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"TELEGRAM": {
|
||||||
|
"BotToken": "",
|
||||||
|
"ChannelId": 0
|
||||||
|
},
|
||||||
|
"VK": {
|
||||||
|
"AccessToken": "",
|
||||||
|
"GroupId": 0,
|
||||||
|
"ApiVersion": "5.199"
|
||||||
|
},
|
||||||
|
"DB": {
|
||||||
|
"Path": "data/mapping.sqlite"
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user