mirror of
https://github.com/eternnoir/pyTelegramBotAPI.git
synced 2023-08-10 21:12:57 +03:00
Merge pull request #1599 from coder2020official/master
Fix group and supergroup issues with states
This commit is contained in:
commit
d9ab5b0d28
@ -307,7 +307,7 @@ class StateFilter(AdvancedCustomFilter):
|
|||||||
elif isinstance(text, State):
|
elif isinstance(text, State):
|
||||||
text = text.name
|
text = text.name
|
||||||
|
|
||||||
if message.chat.type == 'group':
|
if message.chat.type in ['group', 'supergroup']:
|
||||||
group_state = await self.bot.current_states.get_state(user_id, chat_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
|
||||||
|
@ -149,10 +149,10 @@ async def get_file(token, file_id):
|
|||||||
|
|
||||||
async def get_file_url(token, file_id):
|
async def get_file_url(token, file_id):
|
||||||
if FILE_URL is None:
|
if FILE_URL is None:
|
||||||
return "https://api.telegram.org/file/bot{0}/{1}".format(token, get_file(token, file_id)['file_path'])
|
return "https://api.telegram.org/file/bot{0}/{1}".format(token, await get_file(token, file_id)['file_path'])
|
||||||
else:
|
else:
|
||||||
# noinspection PyUnresolvedReferences
|
# noinspection PyUnresolvedReferences
|
||||||
return FILE_URL.format(token, get_file(token, file_id)['file_path'])
|
return FILE_URL.format(token, await get_file(token, file_id)['file_path'])
|
||||||
|
|
||||||
|
|
||||||
async def download_file(token, file_path):
|
async def download_file(token, file_path):
|
||||||
|
@ -315,7 +315,7 @@ class StateFilter(AdvancedCustomFilter):
|
|||||||
elif isinstance(text, State):
|
elif isinstance(text, State):
|
||||||
text = text.name
|
text = text.name
|
||||||
|
|
||||||
if message.chat.type == 'group':
|
if message.chat.type in ['group', 'supergroup']:
|
||||||
group_state = self.bot.current_states.get_state(user_id, chat_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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user