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 branch 'dev-2.x'

Browse source
This commit is contained in:
Alex Root Junior 2021-07-06 01:23:11 +03:00
commit a6782d91ba
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
aiogram/contrib/fsm_storage/memory.py
View file

@ -105,6 +105,7 @@ class MemoryStorage(BaseStorage):
self.data[chat][user]['bucket'].update(bucket, **kwargs) self.data[chat][user]['bucket'].update(bucket, **kwargs)
def _cleanup(self, chat, user): def _cleanup(self, chat, user):
chat, user = self.resolve_address(chat=chat, user=user)
if self.data[chat][user] == {'state': None, 'data': {}, 'bucket': {}}: if self.data[chat][user] == {'state': None, 'data': {}, 'bucket': {}}:
del self.data[chat][user] del self.data[chat][user]
if not self.data[chat]: if not self.data[chat]:

4
aiogram/contrib/middlewares/i18n.py
View file

@ -132,11 +132,11 @@ class I18nMiddleware(BaseMiddleware):
user: Optional[types.User] = types.User.get_current() user: Optional[types.User] = types.User.get_current()
locale: Optional[Locale] = user.locale if user else None locale: Optional[Locale] = user.locale if user else None
if locale: if locale and locale.language in self.locales:
*_, data = args *_, data = args
language = data['locale'] = locale.language language = data['locale'] = locale.language
return language return language
return None return self.default
async def trigger(self, action, args): async def trigger(self, action, args):
""" """