mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Fix

Browse Source
This commit is contained in:
coder2020official 2022-02-26 22:43:03 +05:00
parent b960a9e574
commit e585c77830
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
telebot/asyncio_filters.py
View File

@ -1,5 +1,6 @@
from abc import ABC from abc import ABC
from typing import Optional, Union from typing import Optional, Union
from telebot.asyncio_handler_backends import State
from telebot import types from telebot import types
@ -277,17 +278,29 @@ class StateFilter(AdvancedCustomFilter):
async def check(self, message, text): async def check(self, message, text):
if text == '*': return True if text == '*': return True
# needs to work with callbackquery
if isinstance(message, types.Message):
chat_id = message.chat.id
user_id = message.from_user.id
if isinstance(message, types.CallbackQuery):
chat_id = message.message.chat.id
user_id = message.from_user.id
message = message.message
if isinstance(text, list): if isinstance(text, list):
new_text = [] new_text = []
for i in text: for i in text:
if isclass(i): i = i.name if isinstance(i, State): i = i.name
new_text.append(i) new_text.append(i)
text = new_text text = new_text
elif isinstance(text, object): elif isinstance(text, State):
text = text.name text = text.name
if message.chat.type == 'group': if message.chat.type == 'group':
group_state = await self.bot.current_states.get_state(message.chat.id, message.from_user.id) group_state = await self.bot.current_states.get_state(user_id, chat_id)
if group_state == text: if group_state == text:
return True return True
elif group_state in text and type(text) is list: elif group_state in text and type(text) is list:
@ -295,7 +308,7 @@ class StateFilter(AdvancedCustomFilter):
else: else:
user_state = await self.bot.current_states.get_state(message.chat.id, message.from_user.id) user_state = await self.bot.current_states.get_state(user_id, chat_id)
if user_state == text: if user_state == text:
return True return True
elif type(text) is list and user_state in text: elif type(text) is list and user_state in text:

26
telebot/custom_filters.py
View File

@ -1,9 +1,12 @@
from abc import ABC from abc import ABC
from typing import Optional, Union from typing import Optional, Union
from telebot.handler_backends import State
from telebot import types from telebot import types
class SimpleCustomFilter(ABC): class SimpleCustomFilter(ABC):
""" """
Simple Custom Filter base class. Simple Custom Filter base class.
@ -281,16 +284,31 @@ class StateFilter(AdvancedCustomFilter):
def check(self, message, text): def check(self, message, text):
if text == '*': return True if text == '*': return True
# needs to work with callbackquery
if isinstance(message, types.Message):
chat_id = message.chat.id
user_id = message.from_user.id
if isinstance(message, types.CallbackQuery):
chat_id = message.message.chat.id
user_id = message.from_user.id
message = message.message
if isinstance(text, list): if isinstance(text, list):
new_text = [] new_text = []
for i in text: for i in text:
if isclass(i): i = i.name if isinstance(i, State): i = i.name
new_text.append(i) new_text.append(i)
text = new_text text = new_text
elif isinstance(text, object): elif isinstance(text, State):
text = text.name text = text.name
if message.chat.type == 'group': if message.chat.type == 'group':
group_state = self.bot.current_states.get_state(message.chat.id, message.from_user.id) group_state = self.bot.current_states.get_state(user_id, chat_id)
if group_state == text: if group_state == text:
return True return True
elif group_state in text and type(text) is list: elif group_state in text and type(text) is list:
@ -298,7 +316,7 @@ class StateFilter(AdvancedCustomFilter):
else: else:
user_state = self.bot.current_states.get_state(message.chat.id, message.from_user.id) user_state = self.bot.current_states.get_state(user_id, chat_id)
if user_state == text: if user_state == text:
return True return True
elif type(text) is list and user_state in text: elif type(text) is list and user_state in text: