Merge branch 'develop' into asyncio

# Conflicts:
#	pyrogram/client/methods/chats/get_chat_members.py
This commit is contained in:
Dan 2019-03-28 16:26:28 +01:00
commit b94f6d4e99

View File

@ -16,12 +16,17 @@
# You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import asyncio
import logging
from typing import Union
import pyrogram
from pyrogram.api import functions, types
from pyrogram.errors import FloodWait
from ...ext import BaseClient
log = logging.getLogger(__name__)
class Filters:
ALL = "all"
@ -116,6 +121,8 @@ class GetChatMembers(BaseClient):
else:
raise ValueError("Invalid filter \"{}\"".format(filter))
while True:
try:
return pyrogram.ChatMembers._parse(
self,
await self.send(
@ -128,5 +135,8 @@ class GetChatMembers(BaseClient):
)
)
)
except FloodWait as e:
log.warning("Sleeping for {}s".format(e.x))
await asyncio.sleep(e.x)
else:
raise ValueError("The chat_id \"{}\" belongs to a user".format(chat_id))