выбор сервера, переработка ссылок

This commit is contained in:
Vlad
2024-10-03 04:43:55 +03:00
parent 35b35b8b44
commit 84f1049371
14 changed files with 106 additions and 53 deletions
+27 -5
View File
@@ -4,9 +4,9 @@ import asyncpg
from config import DATABASE_URL
async def init_db():
conn = await asyncpg.connect(DATABASE_URL)
# Создаем таблицу connections, если она не существует
await conn.execute('''
CREATE TABLE IF NOT EXISTS connections (
tg_id BIGINT PRIMARY KEY NOT NULL,
@@ -14,6 +14,7 @@ async def init_db():
trial INTEGER NOT NULL DEFAULT 0
)
''')
# Создаем таблицу keys, если она не существует
await conn.execute('''
CREATE TABLE IF NOT EXISTS keys (
tg_id BIGINT NOT NULL,
@@ -22,11 +23,22 @@ async def init_db():
created_at BIGINT NOT NULL,
expiry_time BIGINT NOT NULL,
key TEXT NOT NULL,
server_id TEXT NOT NULL DEFAULT 'server1', -- новое поле для идентификатора сервера
PRIMARY KEY (tg_id, client_id)
)
''')
# Добавляем поле server_id в таблицу keys, если его нет
try:
await conn.execute('''
ALTER TABLE keys
ADD COLUMN server_id TEXT NOT NULL DEFAULT 'server1'
''')
except asyncpg.exceptions.DuplicateColumnError:
# Если поле уже существует, ничего не делаем
pass
await conn.close()
async def add_connection(tg_id: int, balance: float = 0.0, trial: int = 0):
conn = await asyncpg.connect(DATABASE_URL)
await conn.execute('''
@@ -43,12 +55,12 @@ async def check_connection_exists(tg_id: int):
await conn.close()
return exists
async def store_key(tg_id: int, client_id: str, email: str, expiry_time: int, key: str):
async def store_key(tg_id: int, client_id: str, email: str, expiry_time: int, key: str, server_id: str):
conn = await asyncpg.connect(DATABASE_URL)
await conn.execute('''
INSERT INTO keys (tg_id, client_id, email, created_at, expiry_time, key)
VALUES ($1, $2, $3, $4, $5, $6)
''', tg_id, client_id, email, int(datetime.utcnow().timestamp() * 1000), expiry_time, key)
INSERT INTO keys (tg_id, client_id, email, created_at, expiry_time, key, server_id)
VALUES ($1, $2, $3, $4, $5, $6, $7)
''', tg_id, client_id, email, int(datetime.utcnow().timestamp() * 1000), expiry_time, key, server_id)
await conn.close()
async def get_keys(tg_id: int):
@@ -61,6 +73,16 @@ async def get_keys(tg_id: int):
await conn.close()
return records
async def get_keys_by_server(tg_id: int, server_id: str):
conn = await asyncpg.connect(DATABASE_URL)
records = await conn.fetch('''
SELECT client_id, email, created_at, key
FROM keys
WHERE tg_id = $1 AND server_id = $2
''', tg_id, server_id)
await conn.close()
return records
async def has_active_key(tg_id: int) -> bool:
conn = await asyncpg.connect(DATABASE_URL)
count = await conn.fetchval("SELECT COUNT(*) FROM keys WHERE tg_id = $1", tg_id)