mirror of
https://github.com/aiogram/aiogram.git
synced 2026-04-08 16:37:47 +00:00
Added full support of Bot API 7.2 (#1444)
* Added base support of Bot API 7.2 * Added base support of Bot API 7.2 * Fixing tests and content types for Telegram Bot API 7.2 update (#1453) * Fixing tests and content types for Telegram Bot API 7.2 * Adding changelog for 1453 PR * Fixes + coverage * Replace `BusinessConnection.date` type * Reformat code * Refactor UserContextMiddleware to use EventContext class This update significantly refactors UserContextMiddleware to leverage a new class, EventContext. Instead of resolving event context as a tuple, it now produces an instance of EventContext. Additional adjustments include supporting a business connection ID for event context identification and facilitating backwards compatibility. Tests and other files were also updated accordingly for these changes. * Cover FSM key builder (business_connection_id * Added changelog --------- Co-authored-by: RoLOQ <roman.fedunn@gmail.com>
This commit is contained in:
parent
5f157beb26
commit
057478621b
147 changed files with 3509 additions and 651 deletions
|
|
@ -26,7 +26,7 @@ from aiogram.exceptions import (
|
|||
TelegramUnauthorizedError,
|
||||
)
|
||||
from aiogram.methods import DeleteMessage, GetMe, TelegramMethod
|
||||
from aiogram.types import UNSET_PARSE_MODE, User, LinkPreviewOptions
|
||||
from aiogram.types import UNSET_PARSE_MODE, LinkPreviewOptions, User
|
||||
from aiogram.types.base import UNSET_DISABLE_WEB_PAGE_PREVIEW, UNSET_PROTECT_CONTENT
|
||||
from tests.mocked_bot import MockedBot
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
from aiogram.enums import StickerFormat
|
||||
from aiogram.methods import AddStickerToSet
|
||||
from aiogram.types import InputSticker
|
||||
from tests.mocked_bot import MockedBot
|
||||
|
|
@ -10,7 +11,9 @@ class TestAddStickerToSet:
|
|||
response: bool = await bot.add_sticker_to_set(
|
||||
user_id=42,
|
||||
name="test stickers pack",
|
||||
sticker=InputSticker(sticker="file id", emoji_list=[":)"]),
|
||||
sticker=InputSticker(
|
||||
sticker="file id", format=StickerFormat.STATIC, emoji_list=[":)"]
|
||||
),
|
||||
)
|
||||
request = bot.get_request()
|
||||
assert response == prepare_result.result
|
||||
|
|
|
|||
|
|
@ -13,8 +13,10 @@ class TestCreateNewStickerSet:
|
|||
name="name",
|
||||
title="title",
|
||||
stickers=[
|
||||
InputSticker(sticker="file id", emoji_list=[":)"]),
|
||||
InputSticker(sticker=FSInputFile("file.png"), emoji_list=["=("]),
|
||||
InputSticker(sticker="file id", format=StickerFormat.STATIC, emoji_list=[":)"]),
|
||||
InputSticker(
|
||||
sticker=FSInputFile("file.png"), format=StickerFormat.STATIC, emoji_list=["=("]
|
||||
),
|
||||
],
|
||||
sticker_format=StickerFormat.STATIC,
|
||||
)
|
||||
|
|
|
|||
24
tests/test_api/test_methods/test_get_business_connection.py
Normal file
24
tests/test_api/test_methods/test_get_business_connection.py
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
from aiogram.methods import GetBusinessConnection
|
||||
from aiogram.types import BusinessConnection, User
|
||||
from tests.mocked_bot import MockedBot
|
||||
|
||||
|
||||
class TestGetBusinessConnection:
|
||||
async def test_bot_method(self, bot: MockedBot):
|
||||
prepare_result = bot.add_result_for(
|
||||
GetBusinessConnection,
|
||||
ok=True,
|
||||
result=BusinessConnection(
|
||||
id="test",
|
||||
user=User(id=42, is_bot=False, first_name="User"),
|
||||
user_chat_id=42,
|
||||
date=42,
|
||||
can_reply=True,
|
||||
is_enabled=True,
|
||||
),
|
||||
)
|
||||
response: BusinessConnection = await bot.get_business_connection(
|
||||
business_connection_id="test"
|
||||
)
|
||||
request = bot.get_request()
|
||||
assert response == prepare_result.result
|
||||
21
tests/test_api/test_methods/test_replace_sticker_in_set.py
Normal file
21
tests/test_api/test_methods/test_replace_sticker_in_set.py
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
from aiogram.methods import ReplaceStickerInSet
|
||||
from aiogram.types import InputSticker
|
||||
from tests.mocked_bot import MockedBot
|
||||
|
||||
|
||||
class TestReplaceStickerInSet:
|
||||
async def test_bot_method(self, bot: MockedBot):
|
||||
prepare_result = bot.add_result_for(ReplaceStickerInSet, ok=True, result=True)
|
||||
|
||||
response: bool = await bot.replace_sticker_in_set(
|
||||
user_id=42,
|
||||
name="test",
|
||||
old_sticker="test",
|
||||
sticker=InputSticker(
|
||||
sticker="test",
|
||||
format="static",
|
||||
emoji_list=["test"],
|
||||
),
|
||||
)
|
||||
request = bot.get_request()
|
||||
assert response == prepare_result.result
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
from aiogram.enums import StickerFormat
|
||||
from aiogram.methods import Request, SetStickerSetThumbnail
|
||||
from tests.mocked_bot import MockedBot
|
||||
|
||||
|
|
@ -6,6 +7,8 @@ class TestSetStickerSetThumbnail:
|
|||
async def test_bot_method(self, bot: MockedBot):
|
||||
prepare_result = bot.add_result_for(SetStickerSetThumbnail, ok=True, result=None)
|
||||
|
||||
response: bool = await bot.set_sticker_set_thumbnail(name="test", user_id=42)
|
||||
response: bool = await bot.set_sticker_set_thumbnail(
|
||||
name="test", format=StickerFormat.STATIC, user_id=42
|
||||
)
|
||||
request = bot.get_request()
|
||||
assert response == prepare_result.result
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ from aiogram.types import (
|
|||
PollOption,
|
||||
ProximityAlertTriggered,
|
||||
ReactionTypeCustomEmoji,
|
||||
SharedUser,
|
||||
Sticker,
|
||||
Story,
|
||||
SuccessfulPayment,
|
||||
|
|
@ -469,7 +470,7 @@ TEST_MESSAGE_USERS_SHARED = Message(
|
|||
from_user=None,
|
||||
users_shared=UsersShared(
|
||||
request_id=0,
|
||||
user_ids=[1, 2],
|
||||
users=[SharedUser(user_id=1), SharedUser(user_id=2)],
|
||||
),
|
||||
)
|
||||
TEST_CHAT_SHARED = Message(
|
||||
|
|
@ -485,8 +486,6 @@ TEST_MESSAGE_STORY = Message(
|
|||
chat=Chat(id=42, type="private"),
|
||||
from_user=User(id=42, is_bot=False, first_name="Test"),
|
||||
story=Story(chat=Chat(id=42, type="private"), id=42),
|
||||
forward_signature="Test",
|
||||
forward_date=datetime.datetime.now(),
|
||||
)
|
||||
|
||||
TEST_MESSAGE_GIVEAWAY = Message(
|
||||
|
|
@ -527,13 +526,6 @@ TEST_MESSAGE_GIVEAWAY_COMPLETED = Message(
|
|||
from_user=None,
|
||||
giveaway_completed=GiveawayCompleted(winner_count=10),
|
||||
)
|
||||
TEST_MESSAGE_HAS_MEDIA_SPOILER = Message(
|
||||
message_id=42,
|
||||
date=datetime.datetime.now(),
|
||||
chat=Chat(id=42, type="private"),
|
||||
from_user=None,
|
||||
has_media_spoiler=True,
|
||||
)
|
||||
TEST_MESSAGE_GENERAL_FORUM_TOPIC_HIDDEN = Message(
|
||||
message_id=42,
|
||||
date=datetime.datetime.now(),
|
||||
|
|
@ -552,7 +544,6 @@ TEST_MESSAGE_WRITE_ACCESS_ALLOWED = Message(
|
|||
message_id=42,
|
||||
date=datetime.datetime.now(),
|
||||
chat=Chat(id=42, type="private"),
|
||||
from_user=None,
|
||||
write_access_allowed=WriteAccessAllowed(),
|
||||
)
|
||||
TEST_MESSAGE_BOOST_ADDED = Message(
|
||||
|
|
@ -625,7 +616,6 @@ MESSAGES_AND_CONTENT_TYPES = [
|
|||
[TEST_MESSAGE_GIVEAWAY_CREATED, ContentType.GIVEAWAY_CREATED],
|
||||
[TEST_MESSAGE_GIVEAWAY_WINNERS, ContentType.GIVEAWAY_WINNERS],
|
||||
[TEST_MESSAGE_GIVEAWAY_COMPLETED, ContentType.GIVEAWAY_COMPLETED],
|
||||
[TEST_MESSAGE_HAS_MEDIA_SPOILER, ContentType.HAS_MEDIA_SPOILER],
|
||||
[TEST_MESSAGE_GENERAL_FORUM_TOPIC_HIDDEN, ContentType.GENERAL_FORUM_TOPIC_HIDDEN],
|
||||
[TEST_MESSAGE_GENERAL_FORUM_TOPIC_UNHIDDEN, ContentType.GENERAL_FORUM_TOPIC_UNHIDDEN],
|
||||
[TEST_MESSAGE_WRITE_ACCESS_ALLOWED, ContentType.WRITE_ACCESS_ALLOWED],
|
||||
|
|
@ -674,7 +664,6 @@ MESSAGES_AND_COPY_METHODS = [
|
|||
[TEST_MESSAGE_USER_SHARED, None],
|
||||
[TEST_CHAT_SHARED, None],
|
||||
[TEST_MESSAGE_GIVEAWAY_COMPLETED, None],
|
||||
[TEST_MESSAGE_HAS_MEDIA_SPOILER, None],
|
||||
[TEST_MESSAGE_WEB_APP_DATA, None],
|
||||
[TEST_FORUM_TOPIC_CREATED, None],
|
||||
[TEST_FORUM_TOPIC_EDITED, None],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue