Improved imports
This commit is contained in:
Profitroll
parent
19b83c0631
commit
4fd4f0a6a4
52
bwtbot.py
52
bwtbot.py
|
|
@ -1,14 +1,15 @@
|
|||
#-*- coding: utf-8 -*-
|
||||
|
||||
import traceback
|
||||
from pyrogram import Client, filters, idle
|
||||
from pyrogram.types import ForceReply, BotCommand, BotCommandScopeChat
|
||||
from os import getpid, system
|
||||
from subprocess import call
|
||||
from pyrogram import filters
|
||||
from pyrogram.client import Client
|
||||
from pyrogram.sync import idle
|
||||
from pyrogram.types import ForceReply, BotCommand, BotCommandScopeChat, Message
|
||||
from pyrogram.enums.chat_action import ChatAction
|
||||
from functions import *
|
||||
from modules.colors import *
|
||||
from modules.bwt import *
|
||||
import subprocess
|
||||
import os
|
||||
|
||||
config = jsonLoad("config.json")
|
||||
|
||||
|
|
@ -18,7 +19,7 @@ app = Client(config["bot_name"], api_id=config["api_id"], api_hash=config["api_h
|
|||
|
||||
|
||||
@app.on_message(~ filters.scheduled & filters.command(["setcard", "задать карту"], prefixes=["/", ""]))
|
||||
async def setcard(_, msg):
|
||||
async def setcard(_: Client, msg: Message):
|
||||
if userGet(msg.from_user.id, "context") is None:
|
||||
userSet(msg.from_user.id, "context", "set")
|
||||
await msg.reply_text(string("send_number"), reply_markup=ForceReply(placeholder=string("enter_number")))
|
||||
|
|
@ -27,7 +28,7 @@ async def setcard(_, msg):
|
|||
|
||||
|
||||
@app.on_message(~ filters.scheduled & filters.command(["cancel", "відміна"], prefixes=["/", ""]))
|
||||
async def cancel(_, msg):
|
||||
async def cancel(_: Client, msg: Message):
|
||||
if userGet(msg.from_user.id, "context") is not None:
|
||||
userReset(msg.from_user.id, "context")
|
||||
await msg.reply_text(string("cancel"))
|
||||
|
|
@ -36,7 +37,7 @@ async def cancel(_, msg):
|
|||
|
||||
|
||||
@app.on_message(~ filters.scheduled & filters.command(["resetcard", "забути картку"], prefixes=["/", ""]))
|
||||
async def resetcard(_, msg):
|
||||
async def resetcard(_: Client, msg: Message):
|
||||
if userGet(msg.from_user.id, "context") is None:
|
||||
if "card" in jsonLoad("data/database.json")[str(msg.from_user.id)]:
|
||||
userReset(msg.from_user.id, "card")
|
||||
|
|
@ -50,7 +51,7 @@ async def resetcard(_, msg):
|
|||
|
||||
|
||||
@app.on_message(~ filters.scheduled & filters.command(["balance", "баланс"], prefixes=["/", ""]))
|
||||
async def balance(_, msg):
|
||||
async def balance(_: Client, msg: Message):
|
||||
if userGet(msg.from_user.id, "context") is None:
|
||||
try:
|
||||
if "card" in jsonLoad("data/database.json")[str(msg.from_user.id)]:
|
||||
|
|
@ -68,15 +69,16 @@ async def balance(_, msg):
|
|||
await msg.reply_text(string("card_not_linked").format(string("get_number")))
|
||||
appendLog(f"User {str(msg.from_user.id)} tried to get balance without card set")
|
||||
except Exception as exp:
|
||||
await msg.reply_text(string("error_occured").format(string("get_number")))
|
||||
await app.send_message(owner_id, f"Error occured by {str(msg.from_user.id)}:\nException: `{exp}`\nTraceback: `{traceback.format_exc()}`")
|
||||
if msg.from_user.id != config["owner_id"]:
|
||||
await msg.reply_text(string("error_occured").format(string("get_number")))
|
||||
await app.send_message(owner_id, f"Error occured by {str(msg.from_user.id)}:\nException: `{exp}`\nTraceback: `{format_exc()}`")
|
||||
appendLog(f"User {str(msg.from_user.id)} could not get left water amount")
|
||||
else:
|
||||
await msg.reply_text(string("cancel_first"))
|
||||
|
||||
|
||||
@app.on_message(~ filters.scheduled & filters.command(["topup", "refill", "поповнити"], prefixes=["/", ""]))
|
||||
async def topup_cmd(_, msg):
|
||||
async def topup_cmd(_: Client, msg: Message):
|
||||
if userGet(msg.from_user.id, "context") is None:
|
||||
try:
|
||||
if "card" in jsonLoad("data/database.json")[str(msg.from_user.id)]:
|
||||
|
|
@ -87,13 +89,13 @@ async def topup_cmd(_, msg):
|
|||
await msg.reply_text(string("card_not_linked").format(string("get_number")))
|
||||
appendLog(f"User {str(msg.from_user.id)} tried to request top up without card set")
|
||||
except Exception as exp:
|
||||
await msg.reply_text(exp)
|
||||
await msg.reply_text(str(exp))
|
||||
else:
|
||||
await msg.reply_text(string("cancel_first"))
|
||||
|
||||
|
||||
@app.on_message(~ filters.scheduled & filters.command(["start", "help", "допомога"], prefixes=["/", ""]))
|
||||
async def help(_, msg):
|
||||
async def help(_: Client, msg: Message):
|
||||
if userGet(msg.from_user.id, "context") is None:
|
||||
await msg.reply_text(string("welcome").format(string("get_number")))
|
||||
if msg.from_user.language_code in jsonLoad("strings.json"):
|
||||
|
|
@ -103,13 +105,13 @@ async def help(_, msg):
|
|||
else:
|
||||
await msg.reply_text(string("cancel_first"))
|
||||
|
||||
pid = os.getpid()
|
||||
pid = getpid()
|
||||
|
||||
@app.on_message(~ filters.scheduled & filters.command(["kill", "die", "shutdown"], prefixes="/"))
|
||||
async def kill(_, msg):
|
||||
async def kill(_: Client, msg: Message):
|
||||
if msg.from_user.id == owner_id:
|
||||
await msg.reply_text(f"Shutting down bot with pid **{pid}**")
|
||||
os.system(f"kill -9 {pid}")
|
||||
system(f"kill -9 {pid}")
|
||||
|
||||
|
||||
@app.on_message(~ filters.scheduled)
|
||||
|
|
@ -122,8 +124,8 @@ async def any_message_handler(app, msg):
|
|||
|
||||
print(f'{nowtime()} {WHITE}Starting with PID {YELLOW}{pid}{RESET}')
|
||||
|
||||
app.start()
|
||||
app.send_message(owner_id, f"Starting bot with pid **{pid}**")
|
||||
app.start() # type: ignore
|
||||
app.send_message(owner_id, f"Starting bot with pid **{pid}**") # type: ignore
|
||||
|
||||
app.set_bot_commands([
|
||||
BotCommand("help", "Меню допомоги"),
|
||||
|
|
@ -133,7 +135,7 @@ app.set_bot_commands([
|
|||
BotCommand("resetcard", "Відв'язати картку"),
|
||||
BotCommand("cancel", "Відмінити операцію"),
|
||||
],
|
||||
language_code="uk")
|
||||
language_code="uk") # type: ignore
|
||||
|
||||
app.set_bot_commands([
|
||||
BotCommand("help", "Меню допомоги"),
|
||||
|
|
@ -143,7 +145,7 @@ app.set_bot_commands([
|
|||
BotCommand("resetcard", "Відв'язати картку"),
|
||||
BotCommand("cancel", "Відмінити операцію"),
|
||||
],
|
||||
language_code="ru")
|
||||
language_code="ru") # type: ignore
|
||||
|
||||
app.set_bot_commands([
|
||||
BotCommand("help", "Help menu"),
|
||||
|
|
@ -152,7 +154,7 @@ app.set_bot_commands([
|
|||
BotCommand("setcard", "Link card"),
|
||||
BotCommand("resetcard", "Unlink card"),
|
||||
BotCommand("cancel", "Cancel operation"),
|
||||
])
|
||||
]) # type: ignore
|
||||
|
||||
app.set_bot_commands([
|
||||
BotCommand("help", "Help menu"),
|
||||
|
|
@ -163,11 +165,11 @@ app.set_bot_commands([
|
|||
BotCommand("shutdown", "Turn off the bot"),
|
||||
BotCommand("cancel", "Cancel operation"),
|
||||
],
|
||||
scope=BotCommandScopeChat(chat_id=owner_id))
|
||||
scope=BotCommandScopeChat(chat_id=owner_id)) # type: ignore
|
||||
|
||||
idle()
|
||||
|
||||
app.send_message(owner_id, f"Shutting down bot with pid **{pid}**")
|
||||
app.send_message(owner_id, f"Shutting down bot with pid **{pid}**") # type: ignore
|
||||
print(f'\n{nowtime()} {WHITE}Shutting down with PID {YELLOW}{pid}{RESET}')
|
||||
|
||||
subprocess.call(f'kill -9 {pid}', shell=True)
|
||||
call(f'kill -9 {pid}', shell=True)
|
||||
|
|
|
|||
38
functions.py
38
functions.py
|
|
@ -1,34 +1,29 @@
|
|||
#-*- coding: utf-8 -*-
|
||||
|
||||
import json
|
||||
import os
|
||||
import shutil
|
||||
import gzip
|
||||
import time
|
||||
from os import makedirs, stat
|
||||
from gzip import open as gzipopen
|
||||
from shutil import copyfileobj
|
||||
from time import sleep
|
||||
from ujson import loads, dumps
|
||||
from modules.colors import *
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
path = Path(__file__).resolve().parent
|
||||
|
||||
days_path = str(path)+"/assets/days/"
|
||||
users_path = str(path)+"/users/"
|
||||
logs_folder = str(path)+"/logs/"
|
||||
users_path = "users/"
|
||||
logs_folder = "logs/"
|
||||
|
||||
|
||||
def jsonSave(filename, value):
|
||||
with open(filename, 'w', encoding="utf-8") as f:
|
||||
json.dump(value, f, indent=4, ensure_ascii=False)
|
||||
f.close()
|
||||
f.write(dumps(value, indent=4, ensure_ascii=False))
|
||||
|
||||
def jsonLoad(filename):
|
||||
with open(filename, 'r', encoding="utf-8") as f:
|
||||
value = json.load(f)
|
||||
f.close()
|
||||
value = loads(f.read())
|
||||
return value
|
||||
|
||||
|
||||
config = jsonLoad(f"{path}/config.json")
|
||||
config = jsonLoad(f"config.json")
|
||||
|
||||
log_size = config["log_size"]
|
||||
owner_id = config["owner_id"]
|
||||
|
|
@ -44,12 +39,12 @@ def checkSize():
|
|||
|
||||
while i < 2:
|
||||
try:
|
||||
log = os.stat(logs_folder + 'latest.log')
|
||||
log = stat(logs_folder + 'latest.log')
|
||||
|
||||
if (log.st_size / 1024) > log_size:
|
||||
with open(logs_folder + 'latest.log', 'rb') as f_in:
|
||||
with gzip.open(f'{logs_folder}{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.zip', 'wb') as f_out:
|
||||
shutil.copyfileobj(f_in, f_out)
|
||||
with gzipopen(f'{logs_folder}{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.zip', 'wb') as f_out:
|
||||
copyfileobj(f_in, f_out)
|
||||
|
||||
open(logs_folder + 'latest.log', 'w').close()
|
||||
|
||||
|
|
@ -62,7 +57,7 @@ def checkSize():
|
|||
open(logs_folder + 'latest.log', 'a').close()
|
||||
except:
|
||||
try:
|
||||
os.mkdir(logs_folder)
|
||||
makedirs(logs_folder, exist_ok=True)
|
||||
log = open(logs_folder + 'latest.log', 'a')
|
||||
open(logs_folder + 'latest.log', 'a').close()
|
||||
except:
|
||||
|
|
@ -80,14 +75,15 @@ def appendLog(message):
|
|||
open(logs_folder + 'latest.log', 'a').close()
|
||||
except:
|
||||
try:
|
||||
os.mkdir(logs_folder)
|
||||
makedirs(logs_folder, exist_ok=True)
|
||||
log = open(logs_folder + 'latest.log', 'a')
|
||||
open(logs_folder + 'latest.log', 'a').close()
|
||||
except:
|
||||
time.sleep(2)
|
||||
sleep(2)
|
||||
print('Log file could not be created')
|
||||
return
|
||||
|
||||
print(message, flush=True)
|
||||
log.write(f'[{datetime.now().strftime("%H:%M:%S | %d.%m.%Y")}] {message}\n')
|
||||
|
||||
log.close()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
#-*- coding: utf-8 -*-
|
||||
|
||||
from subprocess import run
|
||||
from os import makedirs, path
|
||||
from subprocess import check_output
|
||||
from traceback import format_exc
|
||||
from uuid import uuid4
|
||||
from functions import *
|
||||
from bs4 import BeautifulSoup
|
||||
|
||||
|
|
@ -16,16 +18,19 @@ async def getWaterLeft(cardid, filename, app=None):
|
|||
|
||||
try:
|
||||
|
||||
run(["touch", f"data/pages/{str(filename)}.html"])
|
||||
# if path.exists(f"data/pages/{str(filename)}.html") is False:
|
||||
# run(["touch", f"data/pages/{str(filename)}.html"])
|
||||
|
||||
if config["use_compiled_page_saver"]:
|
||||
run(["PageSaver/pageSaver", f"\"https://bwtaqua.com.ua/card-topup/?id={cardid}\"", ">", f"data/pages/{str(filename)}.html"])
|
||||
if config["use_compiled_page_saver"] is True:
|
||||
proc = check_output(["PageSaver/pageSaver", f"https://bwtaqua.com.ua/card-topup/?id={cardid}"]) #, ">", f"data/pages/{str(filename)}.html"])
|
||||
html_file = proc.decode("utf-8")
|
||||
else:
|
||||
run(["node", "PageSaver/pageSaver.js", f"\"https://bwtaqua.com.ua/card-topup/?id={cardid}\"", ">", f"data/pages/{str(filename)}.html"])
|
||||
proc = check_output(["node", "./PageSaver/pageSaver.js", f"https://bwtaqua.com.ua/card-topup/?id={cardid}"]) #, ">", f"data/pages/{str(filename)}.html"])
|
||||
html_file = proc.decode("utf-8")
|
||||
|
||||
with open(f'data/pages/{str(filename)}.html') as f:
|
||||
html_file = f.read()
|
||||
f.close()
|
||||
# with open(f'data/pages/{str(filename)}.html') as f:
|
||||
# html_file = f.read()
|
||||
# f.close()
|
||||
|
||||
soup = BeautifulSoup(html_file, 'html.parser')
|
||||
|
||||
|
|
@ -36,11 +41,20 @@ async def getWaterLeft(cardid, filename, app=None):
|
|||
except Exception as exp:
|
||||
|
||||
appendLog(f"Exception occured: {exp} (user: {str(filename)}, cardid: {cardid})")
|
||||
|
||||
try:
|
||||
tmp_name = str(uuid4())
|
||||
makedirs("tmp", exist_ok=True)
|
||||
with open(path.join("tmp", tmp_name), "w", encoding="utf-8") as f:
|
||||
f.write(html_file)
|
||||
except NameError:
|
||||
tmp_name = "N/A"
|
||||
appendLog(f"'html_file' is not defined so I won't gather any tmp data")
|
||||
|
||||
if app != None:
|
||||
await app.send_message(config["owner_id"], f"**Exception occured:**\n • User: `{str(filename)}`\n • Card: [{cardid}]({url})\n • Exception: `{exp}`\n • Traceback: `{format_exc()}`", disable_web_page_preview=True)
|
||||
await app.send_message(config["owner_id"], f"**Exception occured:**\n • User: `{str(filename)}`\n • Card: [{cardid}]({url})\n • Exception: `{exp}`\n • TMP UUID: `{tmp_name}`\n • Traceback: `{format_exc()}`", disable_web_page_preview=True)
|
||||
else:
|
||||
print(f'Exception occured and could not send to user: {exp}')
|
||||
appendLog(f'Exception occured and could not send to user: {exp}')
|
||||
|
||||
output = "Failure"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue