Logs now show the user's name, not just the id
This commit is contained in:
parent
e0345df54e
commit
ecff3ccf38
15
bot/bot.py
15
bot/bot.py
|
@ -31,8 +31,9 @@ def home():
|
||||||
@bot.message_handler(commands=['login'])
|
@bot.message_handler(commands=['login'])
|
||||||
def login(message):
|
def login(message):
|
||||||
id = message.from_user.id
|
id = message.from_user.id
|
||||||
|
name = message.from_user.first_name
|
||||||
passwd = message.text.replace('/login ', '')
|
passwd = message.text.replace('/login ', '')
|
||||||
f = str(func.u_auth(id,passwd))
|
f = str(func.u_auth(name,id,passwd))
|
||||||
if f == str(msg.get('sucauth')) or f == str(msg.get('alauth')):
|
if f == str(msg.get('sucauth')) or f == str(msg.get('alauth')):
|
||||||
bot.reply_to(message,f,reply_markup=home())
|
bot.reply_to(message,f,reply_markup=home())
|
||||||
else:
|
else:
|
||||||
|
@ -62,11 +63,12 @@ def folder_menu():
|
||||||
@bot.message_handler(commands=['add'])
|
@bot.message_handler(commands=['add'])
|
||||||
def add(message):
|
def add(message):
|
||||||
id = message.from_user.id
|
id = message.from_user.id
|
||||||
|
name = message.from_user.first_name
|
||||||
txt = message.text.split(' ', 2)
|
txt = message.text.split(' ', 2)
|
||||||
if len(txt) == 3:
|
if len(txt) == 3:
|
||||||
key = txt[1]
|
key = txt[1]
|
||||||
path = txt[2]
|
path = txt[2]
|
||||||
f = str(func.add_dir(id,key,path))
|
f = str(func.add_dir(name,id,key,path))
|
||||||
else:
|
else:
|
||||||
f = str(msg.get('aerr'))
|
f = str(msg.get('aerr'))
|
||||||
bot.reply_to(message,f,reply_markup=home())
|
bot.reply_to(message,f,reply_markup=home())
|
||||||
|
@ -75,8 +77,9 @@ def add(message):
|
||||||
@bot.message_handler(commands=['del'])
|
@bot.message_handler(commands=['del'])
|
||||||
def rm(message):
|
def rm(message):
|
||||||
id = message.from_user.id
|
id = message.from_user.id
|
||||||
|
name = message.from_user.first_name
|
||||||
folder = message.text.replace('/del ', '')
|
folder = message.text.replace('/del ', '')
|
||||||
f = func.del_dir(id,folder)
|
f = func.del_dir(name,id,folder)
|
||||||
bot.reply_to(message,str(f),reply_markup=home())
|
bot.reply_to(message,str(f),reply_markup=home())
|
||||||
|
|
||||||
# Magnet
|
# Magnet
|
||||||
|
@ -113,6 +116,7 @@ def file(message):
|
||||||
@bot.message_handler(content_types=['document'])
|
@bot.message_handler(content_types=['document'])
|
||||||
def download(message):
|
def download(message):
|
||||||
id = message.from_user.id
|
id = message.from_user.id
|
||||||
|
name = message.from_user.first_name
|
||||||
if func.auth_check(id):
|
if func.auth_check(id):
|
||||||
global type, dir, folder_list
|
global type, dir, folder_list
|
||||||
if dir != None and type == 'file':
|
if dir != None and type == 'file':
|
||||||
|
@ -123,7 +127,7 @@ def download(message):
|
||||||
file_name = os.path.join(PATH, message.document.file_name)
|
file_name = os.path.join(PATH, message.document.file_name)
|
||||||
with open(file_name, 'wb') as dl:
|
with open(file_name, 'wb') as dl:
|
||||||
dl.write(file)
|
dl.write(file)
|
||||||
f = str(func.file(id,file_name,dir))
|
f = str(func.file(name,id,file_name,dir))
|
||||||
dir, type, folder_list = None,None,[]
|
dir, type, folder_list = None,None,[]
|
||||||
bot.reply_to(message,f)
|
bot.reply_to(message,f)
|
||||||
else:
|
else:
|
||||||
|
@ -146,13 +150,14 @@ def dirchoose(message):
|
||||||
def unknown(message):
|
def unknown(message):
|
||||||
global type, dir, folder_list
|
global type, dir, folder_list
|
||||||
id = message.from_user.id
|
id = message.from_user.id
|
||||||
|
name = message.from_user.first_name
|
||||||
if func.auth_check(id):
|
if func.auth_check(id):
|
||||||
txt = message.text
|
txt = message.text
|
||||||
if txt in folder_list:
|
if txt in folder_list:
|
||||||
dirchoose(message)
|
dirchoose(message)
|
||||||
return None
|
return None
|
||||||
if dir != None and type == 'magnet':
|
if dir != None and type == 'magnet':
|
||||||
f = str(func.magnet(id,txt,dir))
|
f = str(func.magnet(name,id,txt,dir))
|
||||||
dir, type, folder_list = None,None,[]
|
dir, type, folder_list = None,None,[]
|
||||||
bot.reply_to(message,f)
|
bot.reply_to(message,f)
|
||||||
bot.reply_to(message,str(msg.get('type')),reply_markup=home())
|
bot.reply_to(message,str(msg.get('type')),reply_markup=home())
|
||||||
|
|
20
bot/func.py
20
bot/func.py
|
@ -19,7 +19,7 @@ def qbt():
|
||||||
os.system(f"bash -c '{command}'")
|
os.system(f"bash -c '{command}'")
|
||||||
output = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
|
output = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
|
||||||
|
|
||||||
def u_auth(id,passwd):
|
def u_auth(name,id,passwd):
|
||||||
list = []
|
list = []
|
||||||
if db.check('obj',AUTH_FILE):
|
if db.check('obj',AUTH_FILE):
|
||||||
list = db.read(AUTH_FILE)
|
list = db.read(AUTH_FILE)
|
||||||
|
@ -29,7 +29,7 @@ def u_auth(id,passwd):
|
||||||
if passwd == os.environ['PASS']:
|
if passwd == os.environ['PASS']:
|
||||||
list.append(id)
|
list.append(id)
|
||||||
db.write(list,AUTH_FILE)
|
db.write(list,AUTH_FILE)
|
||||||
log.auth(id)
|
log.auth(name,id)
|
||||||
return msg.get('sucauth')
|
return msg.get('sucauth')
|
||||||
else:
|
else:
|
||||||
return msg.get('wrauth')
|
return msg.get('wrauth')
|
||||||
|
@ -42,7 +42,7 @@ def auth_check(id):
|
||||||
if id in list:
|
if id in list:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def add_dir(id,dir,path):
|
def add_dir(name,id,dir,path):
|
||||||
if auth_check(id):
|
if auth_check(id):
|
||||||
if os.path.exists(path) == False:
|
if os.path.exists(path) == False:
|
||||||
return str(msg.get('pne')).format(path)
|
return str(msg.get('pne')).format(path)
|
||||||
|
@ -52,12 +52,12 @@ def add_dir(id,dir,path):
|
||||||
dict = {}
|
dict = {}
|
||||||
dict.setdefault(dir,path)
|
dict.setdefault(dir,path)
|
||||||
db.write(dict,DIR_FILE)
|
db.write(dict,DIR_FILE)
|
||||||
log.add(id,dir,path)
|
log.add(name,id,dir,path)
|
||||||
return str(msg.get('fsa')).format(dir)
|
return str(msg.get('fsa')).format(dir)
|
||||||
else:
|
else:
|
||||||
return msg.get('adeny')
|
return msg.get('adeny')
|
||||||
|
|
||||||
def del_dir(id,dir):
|
def del_dir(name,id,dir):
|
||||||
if auth_check(id):
|
if auth_check(id):
|
||||||
if db.check('obj',DIR_FILE):
|
if db.check('obj',DIR_FILE):
|
||||||
dict = db.read(DIR_FILE)
|
dict = db.read(DIR_FILE)
|
||||||
|
@ -66,32 +66,32 @@ def del_dir(id,dir):
|
||||||
if dir in dict:
|
if dir in dict:
|
||||||
del dict[dir]
|
del dict[dir]
|
||||||
db.write(dict,DIR_FILE)
|
db.write(dict,DIR_FILE)
|
||||||
log.rm(id,dir)
|
log.rm(name,id,dir)
|
||||||
return str(msg.get('frm')).format(dir)
|
return str(msg.get('frm')).format(dir)
|
||||||
else:
|
else:
|
||||||
return str(msg.get('fne')).format(dir)
|
return str(msg.get('fne')).format(dir)
|
||||||
else:
|
else:
|
||||||
return msg.get('adeny')
|
return msg.get('adeny')
|
||||||
|
|
||||||
def magnet(id,link,dir):
|
def magnet(name,id,link,dir):
|
||||||
if auth_check(id):
|
if auth_check(id):
|
||||||
dict = db.read(DIR_FILE)
|
dict = db.read(DIR_FILE)
|
||||||
path = dict[dir]
|
path = dict[dir]
|
||||||
command = f'''qbt torrent add url "{link}" -f "{path}"'''
|
command = f'''qbt torrent add url "{link}" -f "{path}"'''
|
||||||
os.system(f"bash -c '{command}'")
|
os.system(f"bash -c '{command}'")
|
||||||
log.addmagnet(id,link)
|
log.addmagnet(name,id,link)
|
||||||
return msg.get('add')
|
return msg.get('add')
|
||||||
else:
|
else:
|
||||||
return msg.get('adeny')
|
return msg.get('adeny')
|
||||||
|
|
||||||
def file(id,file,dir):
|
def file(name,id,file,dir):
|
||||||
if auth_check(id):
|
if auth_check(id):
|
||||||
dict = db.read(DIR_FILE)
|
dict = db.read(DIR_FILE)
|
||||||
path = dict[dir]
|
path = dict[dir]
|
||||||
command = f'''qbt torrent add file "{file}" -f {path}'''
|
command = f'''qbt torrent add file "{file}" -f {path}'''
|
||||||
os.system(f"bash -c '{command}'")
|
os.system(f"bash -c '{command}'")
|
||||||
os.remove(file)
|
os.remove(file)
|
||||||
log.addfile(id,file)
|
log.addfile(name,id,file)
|
||||||
return msg.get('add')
|
return msg.get('add')
|
||||||
else:
|
else:
|
||||||
return msg.get('adeny')
|
return msg.get('adeny')
|
||||||
|
|
20
bot/lang.py
20
bot/lang.py
|
@ -28,11 +28,11 @@ RU = {
|
||||||
# Logs
|
# Logs
|
||||||
'l_create': "Log Файл '{}' создан",
|
'l_create': "Log Файл '{}' создан",
|
||||||
'l_start': 'Запуск бота...',
|
'l_start': 'Запуск бота...',
|
||||||
'l_auth': "Пользователь '{}' успешно авторизировался",
|
'l_auth': "Пользователь '{} ({})' успешно авторизировался",
|
||||||
'l_add': "Пользователь '{}' добавил папку '{}' по пути '{}'",
|
'l_add': "Пользователь '{} ({})' добавил папку '{}' по пути '{}'",
|
||||||
'l_rm': "Пользователь '{}' удалил папку '{}'",
|
'l_rm': "Пользователь '{} ({})' удалил папку '{}'",
|
||||||
'l_file': "Пользователь '{}' добавил в очередь файл '{}'",
|
'l_file': "Пользователь '{} ({})' добавил в очередь файл '{}'",
|
||||||
'l_magnet': "Пользователь '{}' добавил в очередь ссылку '{}'",
|
'l_magnet': "Пользователь '{} ({})' добавил в очередь ссылку '{}'",
|
||||||
'l_errqbt': "Ошибка подключения к qBitTorrent",
|
'l_errqbt': "Ошибка подключения к qBitTorrent",
|
||||||
'l_errtele': "Ошибка подключения к Telegram API, проверьте ваш токен",
|
'l_errtele': "Ошибка подключения к Telegram API, проверьте ваш токен",
|
||||||
}
|
}
|
||||||
|
@ -60,11 +60,11 @@ ENG = {
|
||||||
# Logs
|
# Logs
|
||||||
'l_create': "Log File '{}' created",
|
'l_create': "Log File '{}' created",
|
||||||
'l_start': 'Start bot polling...',
|
'l_start': 'Start bot polling...',
|
||||||
'l_auth': "User '{}' successfully authorized",
|
'l_auth': "User '{} ({})' successfully authorized",
|
||||||
'l_add': "User '{}' added a folder '{}' with the path '{}'",
|
'l_add': "User '{} ({})' added a folder '{}' with the path '{}'",
|
||||||
'l_rm': "User '{}' deleted '{}' folder",
|
'l_rm': "User '{} ({})' deleted '{}' folder",
|
||||||
'l_file': "User '{}' added file '{}' to the queue",
|
'l_file': "User '{} ({})' added file '{}' to the queue",
|
||||||
'l_magnet': "User '{}' added the link '{}' to the queue",
|
'l_magnet': "User '{} ({})' added the link '{}' to the queue",
|
||||||
'l_errqbt': "Error connecting to qBitTorrent",
|
'l_errqbt': "Error connecting to qBitTorrent",
|
||||||
'l_errtele': "Error connecting to Telegram API, check your token"
|
'l_errtele': "Error connecting to Telegram API, check your token"
|
||||||
}
|
}
|
||||||
|
|
20
bot/log.py
20
bot/log.py
|
@ -29,28 +29,28 @@ def start():
|
||||||
file(log2)
|
file(log2)
|
||||||
print(f'{log1}\n{log2}')
|
print(f'{log1}\n{log2}')
|
||||||
|
|
||||||
def auth(id):
|
def auth(name,id):
|
||||||
log = DEFAULT + str(msg.get('l_auth').format(id))
|
log = DEFAULT + str(msg.get('l_auth').format(name,id))
|
||||||
file(log)
|
file(log)
|
||||||
print(log)
|
print(log)
|
||||||
|
|
||||||
def add(id,folder,path):
|
def add(name,id,folder,path):
|
||||||
log = DEFAULT + str(msg.get('l_add').format(id,folder,path))
|
log = DEFAULT + str(msg.get('l_add').format(name,id,folder,path))
|
||||||
file(log)
|
file(log)
|
||||||
print(log)
|
print(log)
|
||||||
|
|
||||||
def rm(id,folder):
|
def rm(name,id,folder):
|
||||||
log = DEFAULT + str(msg.get('l_rm').format(id,folder))
|
log = DEFAULT + str(msg.get('l_rm').format(name,id,folder))
|
||||||
file(log)
|
file(log)
|
||||||
print(log)
|
print(log)
|
||||||
|
|
||||||
def addfile(id,filename):
|
def addfile(name,id,filename):
|
||||||
log = DEFAULT + str(msg.get('l_file').format(id,filename[9:]))
|
log = DEFAULT + str(msg.get('l_file').format(name,id,filename[9:]))
|
||||||
file(log)
|
file(log)
|
||||||
print(log)
|
print(log)
|
||||||
|
|
||||||
def addmagnet(id,link):
|
def addmagnet(name,id,link):
|
||||||
log = DEFAULT + str(msg.get('l_magnet').format(id,link))
|
log = DEFAULT + str(msg.get('l_magnet').format(name,id,link))
|
||||||
file(log)
|
file(log)
|
||||||
print(log)
|
print(log)
|
||||||
|
|
||||||
|
|
Reference in New Issue