Обновлены пути к базе данных в коде и изменены настройки пользователя в docker-compose. Удален файл базы данных.
This commit is contained in:
parent
7eb893260a
commit
71df03c121
2
.env
2
.env
@ -1,4 +1,4 @@
|
|||||||
BOT_TOKEN=8077782035:AAFGLfpleGNbghm7uwO5-sLrjdauCfk2WRk
|
BOT_TOKEN=8077782035:AAFGLfpleGNbghm7uwO5-sLrjdauCfk2WRk
|
||||||
ADMIN_PASSWORD=admin123
|
ADMIN_PASSWORD=admin123
|
||||||
SUPER_ADMIN_PASSWORD=superadmin123
|
SUPER_ADMIN_PASSWORD=superadmin123
|
||||||
DATABASE_PATH=bot.db
|
DATABASE_PATH=/app/data/bot.db
|
50
Program.cs
50
Program.cs
@ -120,7 +120,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -216,7 +216,7 @@ class Program
|
|||||||
|
|
||||||
private static async Task ViewUserReports(ITelegramBotClient botClient, long chatId)
|
private static async Task ViewUserReports(ITelegramBotClient botClient, long chatId)
|
||||||
{
|
{
|
||||||
string connectionString = "Data Source=bot.db";
|
string connectionString = $"Data Source={_databasePath}";
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -277,7 +277,7 @@ class Program
|
|||||||
// Получаем текущие настройки пользователя
|
// Получаем текущие настройки пользователя
|
||||||
bool notificationsEnabled = true; // По умолчанию уведомления включены
|
bool notificationsEnabled = true; // По умолчанию уведомления включены
|
||||||
|
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -930,7 +930,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -962,7 +962,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1015,7 +1015,7 @@ class Program
|
|||||||
// Проверяем настройки пользователя
|
// Проверяем настройки пользователя
|
||||||
bool notificationsEnabled = true; // По умолчанию уведомления включены
|
bool notificationsEnabled = true; // По умолчанию уведомления включены
|
||||||
|
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1056,7 +1056,7 @@ class Program
|
|||||||
{
|
{
|
||||||
// Проверка текущего состояния перед изменением
|
// Проверка текущего состояния перед изменением
|
||||||
bool currentState = true;
|
bool currentState = true;
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var checkCommand = connection.CreateCommand();
|
var checkCommand = connection.CreateCommand();
|
||||||
@ -1079,7 +1079,7 @@ class Program
|
|||||||
|
|
||||||
Log.Information($"[Отладка] Переключение уведомлений для пользователя {chatId}: action={action}, новое значение={newValue}, значение в БД={dbValue}");
|
Log.Information($"[Отладка] Переключение уведомлений для пользователя {chatId}: action={action}, новое значение={newValue}, значение в БД={dbValue}");
|
||||||
|
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1096,7 +1096,7 @@ class Program
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Проверка после изменения
|
// Проверка после изменения
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var checkCommand = connection.CreateCommand();
|
var checkCommand = connection.CreateCommand();
|
||||||
@ -1207,7 +1207,7 @@ class Program
|
|||||||
|
|
||||||
private static async Task ViewReports(ITelegramBotClient botClient, long chatId)
|
private static async Task ViewReports(ITelegramBotClient botClient, long chatId)
|
||||||
{
|
{
|
||||||
string connectionString = "Data Source=bot.db";
|
string connectionString = $"Data Source={_databasePath}";
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -1264,7 +1264,7 @@ class Program
|
|||||||
|
|
||||||
private static async Task ViewArchivedReports(ITelegramBotClient botClient, long chatId)
|
private static async Task ViewArchivedReports(ITelegramBotClient botClient, long chatId)
|
||||||
{
|
{
|
||||||
string connectionString = "Data Source=bot.db";
|
string connectionString = $"Data Source={_databasePath}";
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -1330,7 +1330,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1470,7 +1470,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
|
|
||||||
@ -1528,7 +1528,7 @@ class Program
|
|||||||
|
|
||||||
// Настройки уведомлений для всех типов администраторов
|
// Настройки уведомлений для всех типов администраторов
|
||||||
bool notifyOnPendingReports = true;
|
bool notifyOnPendingReports = true;
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1588,7 +1588,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1618,7 +1618,7 @@ class Program
|
|||||||
string room = "";
|
string room = "";
|
||||||
string changerFullName = adminFullNames[changerId];
|
string changerFullName = adminFullNames[changerId];
|
||||||
|
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1684,7 +1684,7 @@ class Program
|
|||||||
long userChatId = 0;
|
long userChatId = 0;
|
||||||
|
|
||||||
// Сначала получаем текущий статус и chatId пользователя
|
// Сначала получаем текущий статус и chatId пользователя
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var getStatusCommand = connection.CreateCommand();
|
var getStatusCommand = connection.CreateCommand();
|
||||||
@ -1704,7 +1704,7 @@ class Program
|
|||||||
if (oldStatus == newStatus) return;
|
if (oldStatus == newStatus) return;
|
||||||
|
|
||||||
// Обновляем статус и сохраняем ID администратора
|
// Обновляем статус и сохраняем ID администратора
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -1746,7 +1746,7 @@ class Program
|
|||||||
|
|
||||||
private static async Task SaveReportToDatabase(long chatId, Report report)
|
private static async Task SaveReportToDatabase(long chatId, Report report)
|
||||||
{
|
{
|
||||||
string connectionString = "Data Source=bot.db"; // Используем SQLite
|
string connectionString = $"Data Source={_databasePath}"; // Используем переменную _databasePath
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -1790,7 +1790,7 @@ class Program
|
|||||||
// Обновляем метод CreateDatabaseIfNotExists
|
// Обновляем метод CreateDatabaseIfNotExists
|
||||||
private static async Task CreateDatabaseIfNotExists()
|
private static async Task CreateDatabaseIfNotExists()
|
||||||
{
|
{
|
||||||
string connectionString = "Data Source=bot.db"; // Путь к вашей базе данных
|
string connectionString = $"Data Source={_databasePath}"; // Путь к вашей базе данных
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -1966,7 +1966,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
|
|
||||||
@ -2049,7 +2049,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
|
|
||||||
@ -2091,7 +2091,7 @@ class Program
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
|
|
||||||
@ -2140,7 +2140,7 @@ class Program
|
|||||||
// Получаем список всех администраторов из базы данных
|
// Получаем список всех администраторов из базы данных
|
||||||
var adminsList = new List<(long chatId, string username, bool isSuperAdmin)>();
|
var adminsList = new List<(long chatId, string username, bool isSuperAdmin)>();
|
||||||
|
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
@ -2260,7 +2260,7 @@ class Program
|
|||||||
string priority = "";
|
string priority = "";
|
||||||
string room = "";
|
string room = "";
|
||||||
|
|
||||||
using (var connection = new SqliteConnection("Data Source=bot.db"))
|
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
|
||||||
{
|
{
|
||||||
await connection.OpenAsync();
|
await connection.OpenAsync();
|
||||||
var command = connection.CreateCommand();
|
var command = connection.CreateCommand();
|
||||||
|
0
data/bot.db
Normal file
0
data/bot.db
Normal file
@ -13,9 +13,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data:rw
|
- ./data:/app/data:rw
|
||||||
- ./logs:/app/logs:rw
|
- ./logs:/app/logs:rw
|
||||||
user: "1000:1000"
|
user: "root"
|
||||||
environment:
|
|
||||||
- DATABASE_PATH=/app/data/bot.db
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user