Merge pull request #1703 from coder2020official/downloadfile

Fix #1702

telebot/asyncio_filters.py

@@ -420,7 +420,7 @@ class StateFilter(AdvancedCustomFilter):
             text = text.name
 
         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(chat_id, user_id)
             if group_state == text:
                 return True
             elif type(text) is list and group_state in text:
@@ -428,7 +428,7 @@ class StateFilter(AdvancedCustomFilter):
 
 
         else:
-            user_state = await self.bot.current_states.get_state(user_id, chat_id)
+            user_state = await self.bot.current_states.get_state(chat_id, user_id)
             if user_state == text:
                 return True
             elif type(text) is list and user_state in text:

telebot/asyncio_helper.py

@@ -159,15 +159,13 @@ async def get_file_url(token, file_id):
 async def download_file(token, file_path):
     if FILE_URL is None:
         url =  "https://api.telegram.org/file/bot{0}/{1}".format(token, file_path)
-    else:
-        # noinspection PyUnresolvedReferences
-        url =  FILE_URL.format(token, file_path)
-    async with await session_manager.get_session() as session:
-        async with session.get(url, proxy=proxy) as response:
-            result = await response.read()
-            if response.status != 200:
-                raise ApiHTTPException('Download file', result)
-        
+    else: url =  FILE_URL.format(token, file_path)
+    session = await session_manager.get_session()
+    async with session.get(url, proxy=proxy) as response:
+        if response.status != 200:
+            raise ApiHTTPException('Download file', result)
+        result = await response.read()
+    
     return result
 
 

telebot/custom_filters.py

@@ -428,7 +428,7 @@ class StateFilter(AdvancedCustomFilter):
             text = text.name
         
         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(chat_id, user_id)
             if group_state == text:
                 return True
             elif type(text) is list and group_state in text:
@@ -436,7 +436,7 @@ class StateFilter(AdvancedCustomFilter):
 
 
         else:
-            user_state = self.bot.current_states.get_state(user_id, chat_id)
+            user_state = self.bot.current_states.get_state(chat_id, user_id)
             if user_state == text:
                 return True
             elif type(text) is list and user_state in text: