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-3.x' into chat_action_sender

Browse source
This commit is contained in:
Max Manuylov 2024-03-10 18:14:04 +03:00
commit 8a23853556
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES/1436.bugfix.rst Normal file
View file

@ -0,0 +1 @@
Fixed poll answer FSM context by handling :code:`voter_chat` for :code:`poll_answer` event

2
aiogram/dispatcher/middlewares/user_context.py
View file

@ -71,7 +71,7 @@ class UserContextMiddleware(BaseMiddleware):
if event.pre_checkout_query: if event.pre_checkout_query:
return None, event.pre_checkout_query.from_user, None return None, event.pre_checkout_query.from_user, None
if event.poll_answer: if event.poll_answer:
return None, event.poll_answer.user, None return event.poll_answer.voter_chat, event.poll_answer.user, None
if event.my_chat_member: if event.my_chat_member:
return event.my_chat_member.chat, event.my_chat_member.from_user, None return event.my_chat_member.chat, event.my_chat_member.from_user, None
if event.chat_member: if event.chat_member:

8
tests/test_api/test_client/test_bot.py
View file

@ -44,14 +44,14 @@ class TestBot:
def test_init_default(self): def test_init_default(self):
with check_deprecated( with check_deprecated(
max_version="3.5.0", max_version="3.7.0",
exception=TypeError, exception=TypeError,
): ):
bot = Bot(token="42:Test", parse_mode="HTML") bot = Bot(token="42:Test", parse_mode="HTML")
def test_deprecated_parse_mode(self): def test_deprecated_parse_mode(self):
with check_deprecated( with check_deprecated(
max_version="3.5.0", max_version="3.7.0",
exception=AttributeError, exception=AttributeError,
): ):
bot = Bot(token="42:Test", parse_mode="HTML") bot = Bot(token="42:Test", parse_mode="HTML")
@ -59,7 +59,7 @@ class TestBot:
def test_disable_web_page_preview(self): def test_disable_web_page_preview(self):
with check_deprecated( with check_deprecated(
max_version="3.5.0", max_version="3.7.0",
exception=TypeError, exception=TypeError,
): ):
bot = Bot(token="42:Test", disable_web_page_preview=True) bot = Bot(token="42:Test", disable_web_page_preview=True)
@ -67,7 +67,7 @@ class TestBot:
def test_deprecated_protect_content(self): def test_deprecated_protect_content(self):
with check_deprecated( with check_deprecated(
max_version="3.5.0", max_version="3.7.0",
exception=AttributeError, exception=AttributeError,
): ):
bot = Bot(token="42:Test", protect_content=True) bot = Bot(token="42:Test", protect_content=True)

2
tests/test_api/test_client/test_default.py
View file

@ -61,7 +61,7 @@ class TestDefaultBotProperties:
assert default_bot_properties["link_preview_prefer_large_media"] is True assert default_bot_properties["link_preview_prefer_large_media"] is True
assert default_bot_properties["link_preview_show_above_text"] is True assert default_bot_properties["link_preview_show_above_text"] is True
@pytest.mark.skipif(sys.version_info < (3, 10), reason="requires python3.10 or higher") @pytest.mark.skipif(sys.version_info < (3, 12), reason="requires python3.11 or higher")
def test_dataclass_creation_3_10_plus(self): def test_dataclass_creation_3_10_plus(self):
params = DefaultBotProperties.__dataclass_params__ params = DefaultBotProperties.__dataclass_params__
assert params.slots is True assert params.slots is True