python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev-2.x' into dev-2.x

Browse source
This commit is contained in:
Alex Root Junior 2019-08-28 00:34:42 +03:00
commit 58a8f43e2c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aiogram/bot/bot.py
View file

@ -1132,7 +1132,7 @@ class Bot(BaseBot, DataMixin, ContextInstanceMixin):
permissions = prepare_arg(permissions)
payload = generate_payload(**locals())
result = await self.request(api.Methods.SET_CHAT_PERMISSIONS)
result = await self.request(api.Methods.SET_CHAT_PERMISSIONS, payload)
return result
async def export_chat_invite_link(self, chat_id: typing.Union[base.Integer, base.String]) -> base.String:

10
aiogram/dispatcher/dispatcher.py
View file

@ -915,7 +915,7 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
return FSMContext(storage=self.storage, chat=chat, user=user)
@renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=4)
@renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=3)
@renamed_argument(old_name='chat', new_name='chat_id', until_version='3.0', stacklevel=4)
async def throttle(self, key, *, rate=None, user_id=None, chat_id=None, no_error=None) -> bool:
"""
@ -974,8 +974,8 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
raise Throttled(key=key, chat=chat_id, user=user_id, **data)
return result
@renamed_argument('user', 'user_id', '3.0')
@renamed_argument('chat', 'chat_id', '3.0')
@renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=3)
@renamed_argument(old_name='chat', new_name='chat_id', until_version='3.0', stacklevel=4)
async def check_key(self, key, chat_id=None, user_id=None):
"""
Get information about key in bucket
@ -996,8 +996,8 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
data = bucket.get(key, {})
return Throttled(key=key, chat=chat_id, user=user_id, **data)
@renamed_argument('user', 'user_id', '3.0')
@renamed_argument('chat', 'chat_id', '3.0')
@renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=3)
@renamed_argument(old_name='chat', new_name='chat_id', until_version='3.0', stacklevel=4)
async def release_key(self, key, chat_id=None, user_id=None):
"""
Release blocked key