From 9a7408361cf8f88ca1cb8ae22013c27958134e19 Mon Sep 17 00:00:00 2001
From: monte-monte <6649967+monte-monte@users.noreply.github.com>
Date: Sat, 20 Feb 2021 15:32:39 +0200
Subject: [PATCH] Update builtin.py

In StateFilter check if object is CallbackQuery because it has different structure compared to simple message. This change prevents https://github.com/aiogram/aiogram/issues/508 bug.
---
 aiogram/dispatcher/filters/builtin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aiogram/dispatcher/filters/builtin.py b/aiogram/dispatcher/filters/builtin.py
index 20317f57..e1c8ff4c 100644
--- a/aiogram/dispatcher/filters/builtin.py
+++ b/aiogram/dispatcher/filters/builtin.py
@@ -529,6 +529,8 @@ class StateFilter(BoundFilter):
         self.states = states
 
     def get_target(self, obj):
+        if type(obj) is CallbackQuery:
+            return getattr(getattr(getattr(obj, 'message', None),'chat', None), 'id', None), getattr(getattr(obj, 'from_user', None), 'id', None)
         return getattr(getattr(obj, 'chat', None), 'id', None), getattr(getattr(obj, 'from_user', None), 'id', None)
 
     async def check(self, obj):