From ce7b5f70e014ec2cbf8a8a20193e0aeaa4fd0c10 Mon Sep 17 00:00:00 2001 From: jrootjunior Date: Thu, 12 Dec 2019 12:52:49 +0200 Subject: [PATCH] Optional --- aiogram/dispatcher/handler/base.py | 2 ++ aiogram/dispatcher/handler/message.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aiogram/dispatcher/handler/base.py b/aiogram/dispatcher/handler/base.py index 2759bbb1..017f4c65 100644 --- a/aiogram/dispatcher/handler/base.py +++ b/aiogram/dispatcher/handler/base.py @@ -9,6 +9,7 @@ class BaseHandlerMixin: """ Typed mixin. Do nothing. """ + event: TelegramObject data: Dict[str, Any] @@ -17,6 +18,7 @@ class _HandlerBotMixin(BaseHandlerMixin): """ Mixin adds bot attribute """ + @property def bot(self) -> Bot: if "bot" in self.data: diff --git a/aiogram/dispatcher/handler/message.py b/aiogram/dispatcher/handler/message.py index a0a7bcbd..92b4b486 100644 --- a/aiogram/dispatcher/handler/message.py +++ b/aiogram/dispatcher/handler/message.py @@ -1,7 +1,7 @@ from abc import ABC from typing import Optional -from aiogram.api.types import Message, User, Chat +from aiogram.api.types import Chat, Message, User from aiogram.dispatcher.filters import CommandObject from aiogram.dispatcher.handler.base import BaseHandler, BaseHandlerMixin @@ -10,7 +10,7 @@ class MessageHandler(BaseHandler, ABC): event: Message @property - def from_user(self) -> User: + def from_user(self) -> Optional[User]: return self.event.from_user @property