mirror of https://github.com/coddrago/Heroku
Merge pull request #175 from Rilliat/dev-test
refactored too many одинакового говнокода маркапаpull/176/head
commit
81c15fd312
|
@ -268,9 +268,7 @@ class HerokuWebMod(loader.Module):
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
reply_markup = [
|
reply_markup = {"text": self.strings("enter_code"), "input": self.strings("login_code"), "handler": self.inline_code_handler, "args": (client, phone, user,)}
|
||||||
{"text": self.strings("enter_code"), "input": self.strings("login_code"), "handler": self.inline_code_handler, "args": (client, phone, user,)},
|
|
||||||
]
|
|
||||||
|
|
||||||
await utils.answer(
|
await utils.answer(
|
||||||
call,
|
call,
|
||||||
|
@ -280,11 +278,12 @@ class HerokuWebMod(loader.Module):
|
||||||
)
|
)
|
||||||
|
|
||||||
async def inline_code_handler(self, call, data, client, phone, user):
|
async def inline_code_handler(self, call, data, client, phone, user):
|
||||||
|
_code_markup = {"text": self.strings("enter_code"), "input": self.strings("login_code"), "handler": self.inline_code_handler, "args": (client, phone, user,)}
|
||||||
if not data or len(data) != 5:
|
if not data or len(data) != 5:
|
||||||
await utils.answer(
|
await utils.answer(
|
||||||
call,
|
call,
|
||||||
self.strings("invalid_code"),
|
self.strings("invalid_code"),
|
||||||
reply_markup={"text": self.strings("enter_code"), "input": self.strings("login_code"), "handler": self.inline_code_handler, "args": (client, phone, user,)},
|
reply_markup=_code_markup,
|
||||||
always_allow=[user.id]
|
always_allow=[user.id]
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
@ -293,7 +292,7 @@ class HerokuWebMod(loader.Module):
|
||||||
await utils.answer(
|
await utils.answer(
|
||||||
call,
|
call,
|
||||||
"Код должен состоять только из цифр. Повторите попытку.",
|
"Код должен состоять только из цифр. Повторите попытку.",
|
||||||
reply_markup={"text": self.strings("enter_code"), "input": self.strings("login_code"), "handler": self.inline_code_handler, "args": (client, phone, user,)},
|
reply_markup=_code_markup,
|
||||||
always_allow=[user.id]
|
always_allow=[user.id]
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
@ -323,13 +322,10 @@ class HerokuWebMod(loader.Module):
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
except PhoneCodeInvalidError:
|
except PhoneCodeInvalidError:
|
||||||
reply_markup = [
|
|
||||||
{"text": self.strings("enter_code"), "input": self.strings("login_code"), "handler": self.inline_code_handler, "args": (client, phone, user,)},
|
|
||||||
]
|
|
||||||
await utils.answer(
|
await utils.answer(
|
||||||
call,
|
call,
|
||||||
self.strings("invalid_code"),
|
self.strings("invalid_code"),
|
||||||
reply_markup=reply_markup,
|
reply_markup=_code_markup,
|
||||||
always_allow=[user.id]
|
always_allow=[user.id]
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
@ -345,11 +341,12 @@ class HerokuWebMod(loader.Module):
|
||||||
|
|
||||||
|
|
||||||
async def inline_2fa_handler(self, call, data, client, phone, user):
|
async def inline_2fa_handler(self, call, data, client, phone, user):
|
||||||
|
_2fa_markup = {"text": self.strings("enter_2fa"), "input": self.strings("your_2fa"), "handler": self.inline_2fa_handler, "args": (client, phone, user,)}
|
||||||
if not data:
|
if not data:
|
||||||
await utils.answer(
|
await utils.answer(
|
||||||
call,
|
call,
|
||||||
self.strings("invalid_password"),
|
self.strings("invalid_password"),
|
||||||
reply_markup={"text": self.strings("enter_2fa"), "input": self.strings("your_2fa"), "handler": self.inline_2fa_handler, "args": (client, phone, user,)},
|
reply_markup=_2fa_markup,
|
||||||
always_allow=[user.id]
|
always_allow=[user.id]
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
@ -360,7 +357,7 @@ class HerokuWebMod(loader.Module):
|
||||||
await utils.answer(
|
await utils.answer(
|
||||||
call,
|
call,
|
||||||
self.strings("invalid_password"),
|
self.strings("invalid_password"),
|
||||||
reply_markup={"text": self.strings("enter_2fa"), "input": self.strings("your_2fa"), "handler": self.inline_2fa_handler, "args": (client, phone, user,)},
|
reply_markup=_2fa_markup,
|
||||||
always_allow=[user.id]
|
always_allow=[user.id]
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue