запуск бота и сайта одновременно
This commit is contained in:
@@ -1,7 +1,11 @@
|
|||||||
from Bot import start_work_bot
|
import multiprocessing
|
||||||
|
from modules.Bot import start_work_bot
|
||||||
|
from modules.Site import Site
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
process1 = multiprocessing.Process(target=Site)
|
||||||
|
process1.start()
|
||||||
start_work_bot()
|
start_work_bot()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -44,10 +44,10 @@ async def r_clear(message: types.Message):
|
|||||||
@dp.message_handler(content_types=['text'])
|
@dp.message_handler(content_types=['text'])
|
||||||
async def not_work_user(message: types.Message):
|
async def not_work_user(message: types.Message):
|
||||||
if str(message.from_user.id) == "620318992" and message.text == "Гена, бань его нахуй" and message.reply_to_message:
|
if str(message.from_user.id) == "620318992" and message.text == "Гена, бань его нахуй" and message.reply_to_message:
|
||||||
with open('not_work_user.json', 'r') as f:
|
with open('../not_work_user.json', 'r') as f:
|
||||||
data = json.load(f)
|
data = json.load(f)
|
||||||
data['chat_gpt'].append(message.reply_to_message.from_user.id)
|
data['chat_gpt'].append(message.reply_to_message.from_user.id)
|
||||||
with open('not_work_user.json', 'w') as f:
|
with open('../not_work_user.json', 'w') as f:
|
||||||
json.dump(data, f, indent=4)
|
json.dump(data, f, indent=4)
|
||||||
await message.reply(f"@{message.reply_to_message.from_user.username} "
|
await message.reply(f"@{message.reply_to_message.from_user.username} "
|
||||||
f"вы больше не можете со мной разговаривать")
|
f"вы больше не можете со мной разговаривать")
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
from fastapi import FastAPI, Request, Form, Depends, Cookie, responses, templating, staticfiles
|
||||||
|
from functions.admin import is_logged_in
|
||||||
|
from functions.admin.models import database
|
||||||
|
from functions.admin.templates import logins, refresh, logs, log
|
||||||
|
|
||||||
|
def Site():
|
||||||
|
app = FastAPI()
|
||||||
|
templates = templating.Jinja2Templates(directory="static/templates")
|
||||||
|
app.mount("/static", staticfiles.StaticFiles(directory="static"), name="static")
|
||||||
|
|
||||||
|
@app.get("/", response_class=responses.HTMLResponse)
|
||||||
|
def login(request: Request):
|
||||||
|
return templates.TemplateResponse("index.html", {"request": request})
|
||||||
|
|
||||||
|
@app.get("/login", response_class=responses.HTMLResponse)
|
||||||
|
def login(request: Request):
|
||||||
|
return templates.TemplateResponse("login.html", {"request": request})
|
||||||
|
|
||||||
|
@app.post("/logins")
|
||||||
|
async def logins_response(username: str = Form(...), password: str = Form(...), db=Depends(database.get_db)):
|
||||||
|
return await logins.logins(username, password, db)
|
||||||
|
|
||||||
|
@app.get("/refresh")
|
||||||
|
async def refresh_access_token(req: Request, refresh_token: str = Cookie(None), db=Depends(database.get_db)):
|
||||||
|
return await refresh.refresh_access_token(req, refresh_token, db)
|
||||||
|
|
||||||
|
@app.get("/logs", response_class=responses.HTMLResponse)
|
||||||
|
async def logs_response(request: Request, logged_in: bool = Depends(is_logged_in.is_logged_in)):
|
||||||
|
return await logs.logs(templates, request, logged_in)
|
||||||
|
|
||||||
|
@app.get("/logs/{log_id}", response_class=responses.HTMLResponse)
|
||||||
|
async def log_response(request: Request, log_id: int, logged_in: bool = Depends(is_logged_in.is_logged_in)):
|
||||||
|
return await log.log(templates, request, log_id, logged_in)
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
from fastapi import FastAPI, Request, Form, Depends, Cookie, responses, templating, staticfiles
|
|
||||||
from functions.admin import is_logged_in
|
|
||||||
from functions.admin.models import database
|
|
||||||
from functions.admin.templates import logins, refresh, logs, log
|
|
||||||
|
|
||||||
app = FastAPI()
|
|
||||||
templates = templating.Jinja2Templates(directory="static/templates")
|
|
||||||
app.mount("/static", staticfiles.StaticFiles(directory="static"), name="static")
|
|
||||||
|
|
||||||
@app.get("/", response_class=responses.HTMLResponse)
|
|
||||||
def login(request: Request):
|
|
||||||
return templates.TemplateResponse("index.html", {"request": request})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/login", response_class=responses.HTMLResponse)
|
|
||||||
def login(request: Request):
|
|
||||||
return templates.TemplateResponse("login.html", {"request": request})
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/logins")
|
|
||||||
async def logins_response(username: str = Form(...), password: str = Form(...), db=Depends(database.get_db)):
|
|
||||||
return await logins.logins(username, password, db)
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/refresh")
|
|
||||||
async def refresh_access_token(req: Request, refresh_token: str = Cookie(None), db=Depends(database.get_db)):
|
|
||||||
return await refresh.refresh_access_token(req, refresh_token, db)
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/logs", response_class=responses.HTMLResponse)
|
|
||||||
async def logs_response(request: Request, logged_in: bool = Depends(is_logged_in.is_logged_in)):
|
|
||||||
return await logs.logs(templates, request, logged_in)
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/logs/{log_id}", response_class=responses.HTMLResponse)
|
|
||||||
async def log_response(request: Request, log_id: int, logged_in: bool = Depends(is_logged_in.is_logged_in)):
|
|
||||||
return await log.log(templates, request, log_id, logged_in)
|
|
||||||
|
|||||||
Reference in New Issue
Block a user