NetsPro/bottestbug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Обновлены пути к базе данных в коде и изменены настройки пользователя в docker-compose. Удален файл базы данных.

Browse Source
This commit is contained in:
Professional 2025-05-06 19:37:13 +07:00
parent 7eb893260a
commit 71df03c121
4 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1,4 +1,4 @@
BOT_TOKEN=8077782035:AAFGLfpleGNbghm7uwO5-sLrjdauCfk2WRk
ADMIN_PASSWORD=admin123
SUPER_ADMIN_PASSWORD=superadmin123
DATABASE_PATH=bot.db
DATABASE_PATH=/app/data/bot.db

50
Program.cs
View File

@ -120,7 +120,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -216,7 +216,7 @@ class Program
private static async Task ViewUserReports(ITelegramBotClient botClient, long chatId)
{
string connectionString = "Data Source=bot.db";
string connectionString = $"Data Source={_databasePath}";
try
{
@ -277,7 +277,7 @@ class Program
// Получаем текущие настройки пользователя
bool notificationsEnabled = true; // По умолчанию уведомления включены
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -930,7 +930,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -962,7 +962,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -1015,7 +1015,7 @@ class Program
// Проверяем настройки пользователя
bool notificationsEnabled = true; // По умолчанию уведомления включены
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -1056,7 +1056,7 @@ class Program
{
// Проверка текущего состояния перед изменением
bool currentState = true;
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var checkCommand = connection.CreateCommand();
@ -1079,7 +1079,7 @@ class Program
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();
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();
var checkCommand = connection.CreateCommand();
@ -1207,7 +1207,7 @@ class Program
private static async Task ViewReports(ITelegramBotClient botClient, long chatId)
{
string connectionString = "Data Source=bot.db";
string connectionString = $"Data Source={_databasePath}";
try
{
@ -1264,7 +1264,7 @@ class Program
private static async Task ViewArchivedReports(ITelegramBotClient botClient, long chatId)
{
string connectionString = "Data Source=bot.db";
string connectionString = $"Data Source={_databasePath}";
try
{
@ -1330,7 +1330,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -1470,7 +1470,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
@ -1528,7 +1528,7 @@ class Program
// Настройки уведомлений для всех типов администраторов
bool notifyOnPendingReports = true;
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -1588,7 +1588,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -1618,7 +1618,7 @@ class Program
string room = "";
string changerFullName = adminFullNames[changerId];
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -1684,7 +1684,7 @@ class Program
long userChatId = 0;
// Сначала получаем текущий статус и chatId пользователя
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var getStatusCommand = connection.CreateCommand();
@ -1704,7 +1704,7 @@ class Program
if (oldStatus == newStatus) return;
// Обновляем статус и сохраняем ID администратора
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();
@ -1746,7 +1746,7 @@ class Program
private static async Task SaveReportToDatabase(long chatId, Report report)
{
string connectionString = "Data Source=bot.db"; // Используем SQLite
string connectionString = $"Data Source={_databasePath}"; // Используем переменную _databasePath
try
{
@ -1790,7 +1790,7 @@ class Program
// Обновляем метод CreateDatabaseIfNotExists
private static async Task CreateDatabaseIfNotExists()
{
string connectionString = "Data Source=bot.db"; // Путь к вашей базе данных
string connectionString = $"Data Source={_databasePath}"; // Путь к вашей базе данных
try
{
@ -1966,7 +1966,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
@ -2049,7 +2049,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
@ -2091,7 +2091,7 @@ class Program
{
try
{
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
@ -2140,7 +2140,7 @@ class Program
// Получаем список всех администраторов из базы данных
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();
var command = connection.CreateCommand();
@ -2260,7 +2260,7 @@ class Program
string priority = "";
string room = "";
using (var connection = new SqliteConnection("Data Source=bot.db"))
using (var connection = new SqliteConnection($"Data Source={_databasePath}"))
{
await connection.OpenAsync();
var command = connection.CreateCommand();

0
data/bot.db Normal file
View File

4
docker-compose.yml
View File

@ -13,9 +13,7 @@ services:
volumes:
- ./data:/app/data:rw
- ./logs:/app/logs:rw
user: "1000:1000"
environment:
- DATABASE_PATH=/app/data/bot.db
user: "root"