From 2e207c636cdc59e762c90c0f5a3ee02f8583f4b6 Mon Sep 17 00:00:00 2001 From: Andrey Tikhonov <17@itishka.org> Date: Tue, 6 Jul 2021 01:10:51 +0300 Subject: [PATCH 1/2] fix fault on `reset_state` in memory storage (#619) --- aiogram/contrib/fsm_storage/memory.py | 1 + 1 file changed, 1 insertion(+) diff --git a/aiogram/contrib/fsm_storage/memory.py b/aiogram/contrib/fsm_storage/memory.py index 8950aa8e..a5686a34 100644 --- a/aiogram/contrib/fsm_storage/memory.py +++ b/aiogram/contrib/fsm_storage/memory.py @@ -105,6 +105,7 @@ class MemoryStorage(BaseStorage): self.data[chat][user]['bucket'].update(bucket, **kwargs) def _cleanup(self, chat, user): + chat, user = self.resolve_address(chat=chat, user=user) if self.data[chat][user] == {'state': None, 'data': {}, 'bucket': {}}: del self.data[chat][user] if not self.data[chat]: From 899228904a98c3e8d0b337406387be3f2cedf154 Mon Sep 17 00:00:00 2001 From: alfred richardsn Date: Mon, 5 Jul 2021 22:12:52 +0000 Subject: [PATCH 2/2] Fix unused default locale in I18nMiddleware (#562) (#563) Co-authored-by: Alex Root Junior --- aiogram/contrib/middlewares/i18n.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aiogram/contrib/middlewares/i18n.py b/aiogram/contrib/middlewares/i18n.py index 651b77de..1c50a603 100644 --- a/aiogram/contrib/middlewares/i18n.py +++ b/aiogram/contrib/middlewares/i18n.py @@ -132,11 +132,11 @@ class I18nMiddleware(BaseMiddleware): user: Optional[types.User] = types.User.get_current() locale: Optional[Locale] = user.locale if user else None - if locale: + if locale and locale.language in self.locales: *_, data = args language = data['locale'] = locale.language return language - return None + return self.default async def trigger(self, action, args): """