Исправление багов, добавление подсказок к каждой команде.
This commit is contained in:
justuser
parent
958b5c50c0
commit
09c0a397a2
48
anon.py
48
anon.py
@ -50,7 +50,8 @@ def start(message):
|
||||
def reg(message):
|
||||
try:
|
||||
db = load()
|
||||
if len(message.text.split()) == 2:
|
||||
if not ok_args(bot, message, 2, '```\n/reg никнейм```'):
|
||||
return 0
|
||||
nick = message.text.split()[1]
|
||||
# Проверка ника
|
||||
if not nick_ok(bot, message, nick):
|
||||
@ -66,15 +67,14 @@ def reg(message):
|
||||
|
||||
save(db)
|
||||
bot.reply_to(message, "Вы зарегистрировались!\nПриятного использования.")
|
||||
else:
|
||||
bot.reply_to(message, "Вы ввели не 2 аргумента, нужно: /reg ЛюбойНикнейм")
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
@bot.message_handler(commands=['b'])
|
||||
def b(message):
|
||||
try:
|
||||
if is_auth(bot, message):
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 2, '```\n/b :ник``` или ```\n/b ник```'):
|
||||
return 0
|
||||
db = load()
|
||||
nick = db[str(message.chat.id)]
|
||||
user = db[nick]
|
||||
@ -97,7 +97,8 @@ def b(message):
|
||||
@bot.message_handler(commands=['u'])
|
||||
def u(message):
|
||||
try:
|
||||
if is_auth(bot, message):
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 2, '```\n/u :ник``` или ```\n/u ник```'):
|
||||
return 0
|
||||
db = load()
|
||||
nick = db[str(message.chat.id)]
|
||||
user = db[nick]
|
||||
@ -107,21 +108,24 @@ def u(message):
|
||||
if block[0] == ":":
|
||||
block = block[1:]
|
||||
|
||||
if db[block].id in user.blocks:
|
||||
if block in db and db[block].id in user.blocks:
|
||||
user.blocks.remove(db[block].id)
|
||||
save(db)
|
||||
bot.reply_to(message, f"Была снята блокировка с пользователя {telebot.formatting.hcode(block)}",parse_mode="HTML")
|
||||
else:
|
||||
bot.reply_to(message, "Данного пользователя не существует.")
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
@bot.message_handler(commands=['nick'])
|
||||
def nick(message):
|
||||
try:
|
||||
if is_auth(bot, message):
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 2, '```\n/nick ник```'):
|
||||
return 0
|
||||
db = load()
|
||||
new_nick = message.text.split()[1]
|
||||
# Проверка ника
|
||||
if not nick_ok(message, new_nick):
|
||||
if not nick_ok(bot, message, new_nick):
|
||||
return 0
|
||||
old_nick = db[str(message.chat.id)]
|
||||
|
||||
@ -142,7 +146,8 @@ def nick(message):
|
||||
@bot.message_handler(commands=['av'])
|
||||
def av(message):
|
||||
try:
|
||||
if is_auth(bot, message):
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 2, '```\n/av ❄️```'):
|
||||
return 0
|
||||
db = load()
|
||||
if not len(message.text.split()) > 1:
|
||||
bot.reply_to(message,"Укажите аватарку")
|
||||
@ -163,22 +168,22 @@ def av(message):
|
||||
@bot.message_handler(commands=['key'])
|
||||
def key(message):
|
||||
try:
|
||||
if len(message.text.split()) == 2:
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 2, '```\n/key ник``` или ```\n/key :ник```'):
|
||||
return 0
|
||||
db = load()
|
||||
nick = message.text.split()[1]
|
||||
if nick[0] == ':':
|
||||
nick = nick[1:]
|
||||
key = db[nick].pkey
|
||||
bot.reply_to(message,f"Ключ пользователя: {telebot.formatting.hcode(key)}", parse_mode="HTML")
|
||||
else:
|
||||
bot.reply_to(message,"/key ник")
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
@bot.message_handler(commands=['ver'])
|
||||
def ver(message):
|
||||
try:
|
||||
if len(message.text.split()) == 3:
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 3, '```\n/ver ник ключ``` или ```\n/ver :ник ключ```'):
|
||||
return 0
|
||||
db = load()
|
||||
nick = message.text.split()[1]
|
||||
if nick[0] == ':':
|
||||
@ -192,15 +197,14 @@ def ver(message):
|
||||
bot.reply_to(message,"✅ Ключи совпадают")
|
||||
else:
|
||||
bot.reply_to(message,"❌ Ключи не совпадают")
|
||||
else:
|
||||
bot.reply_to(message,"/ver ник ключ")
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
@bot.message_handler(commands=['key_res'])
|
||||
def key_res(message):
|
||||
try:
|
||||
if is_auth(bot, message):
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 1, '```\n/key_res```'):
|
||||
return 0
|
||||
db = load()
|
||||
|
||||
key = hash(randint(74287, 5747962))
|
||||
@ -223,7 +227,8 @@ def key_res(message):
|
||||
@bot.message_handler(commands=['me'])
|
||||
def me(message):
|
||||
try:
|
||||
if is_auth(bot, message):
|
||||
if not is_auth(bot, message) or not ok_args(bot, message, 1, '```\n/me```'):
|
||||
return 0
|
||||
db = load()
|
||||
nick = db[str(message.chat.id)]
|
||||
user = db[nick]
|
||||
@ -263,10 +268,14 @@ def catch_all_messages(message):
|
||||
bot.reply_to(message, "Не существует данного пользователя.")
|
||||
elif user.channel != None:
|
||||
channel = user.channel
|
||||
db = load()
|
||||
# Проверяем существование пользователя
|
||||
if channel not in db:
|
||||
bot.reply_to(message, "Не существует данного пользователя.")
|
||||
return 0
|
||||
# Проверяем ключи
|
||||
if not key_valid(bot, message, channel):
|
||||
return 0
|
||||
db = load()
|
||||
|
||||
if message.chat.id not in db[channel].blocks:
|
||||
try:
|
||||
@ -299,7 +308,10 @@ def catch_all_messages(message):
|
||||
caption = ""
|
||||
bot.send_video(db[channel].id, vid_id, caption = f"{telebot.formatting.hcode(':'+nick) + avatar}", parse_mode="HTML")
|
||||
else:
|
||||
try:
|
||||
bot.send_message(db[channel].id, f"{telebot.formatting.hcode(':'+nick) + avatar}\n" + message.text, parse_mode="HTML")
|
||||
except:
|
||||
catch_error(bot, message, 'spec_symb')
|
||||
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
@ -17,10 +17,12 @@ def catch_error(bot, message, err_type = None):
|
||||
logging.error(traceback.format_exc()) # Логирование ошибок
|
||||
err = log_stream.getvalue() # Ошибка -> переменная
|
||||
|
||||
bot.reply_to(message, "Critical error:\n\n" + telebot.formatting.hcode(err), parse_mode='HTML')
|
||||
bot.reply_to(message, 'Critical error:\n\n' + telebot.formatting.hcode(err), parse_mode='HTML')
|
||||
|
||||
# Очистка логов
|
||||
log_stream.truncate(0)
|
||||
log_stream.seek(0)
|
||||
elif err_type == 'spec_symb':
|
||||
bot.reply_to(message, 'Невозможно отправить сообщение из-за специфических символов')
|
||||
except:
|
||||
pass
|
||||
|
||||
18
func.py
18
func.py
@ -21,6 +21,7 @@ def is_auth(bot, message):
|
||||
from re import sub, compile
|
||||
# -> True/False
|
||||
def nick_ok(bot, message, nick):
|
||||
try:
|
||||
if len(nick) > 30:
|
||||
bot.reply_to(message,"Слишком длинный ник, попробуйте короче.")
|
||||
return False
|
||||
@ -46,7 +47,8 @@ def nick_ok(bot, message, nick):
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
# Проверяем совпадение ключей при отправке сообщений
|
||||
# -> True/False
|
||||
@ -79,3 +81,17 @@ def key_valid(bot, message, channel):
|
||||
return False
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
|
||||
# Проверка на количество аргументов
|
||||
# ok_args(bot, message, 2, '/nick никнейм') + '/nick test' = True
|
||||
def ok_args(bot, message, count, mess):
|
||||
try:
|
||||
count_args = len(message.text.split())
|
||||
if not count_args == count:
|
||||
bot.reply_to(message, mess, parse_mode="Markdown")
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
except:
|
||||
catch_error(bot, message)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user