mirror of
https://github.com/aiogram/aiogram.git
synced 2026-04-08 16:37:47 +00:00
Treat sender_tag as metadata, not message content type
This commit is contained in:
parent
dd5cf09b1f
commit
d248f092f7
4 changed files with 1 additions and 12 deletions
|
|
@ -39,6 +39,7 @@ extract:
|
||||||
- reply_to_story
|
- reply_to_story
|
||||||
- business_connection_id
|
- business_connection_id
|
||||||
- sender_business_bot
|
- sender_business_bot
|
||||||
|
- sender_tag
|
||||||
- is_from_offline
|
- is_from_offline
|
||||||
- has_media_spoiler
|
- has_media_spoiler
|
||||||
- effect_id
|
- effect_id
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ class ContentType(str, Enum):
|
||||||
|
|
||||||
UNKNOWN = "unknown"
|
UNKNOWN = "unknown"
|
||||||
ANY = "any"
|
ANY = "any"
|
||||||
SENDER_TAG = "sender_tag"
|
|
||||||
TEXT = "text"
|
TEXT = "text"
|
||||||
ANIMATION = "animation"
|
ANIMATION = "animation"
|
||||||
AUDIO = "audio"
|
AUDIO = "audio"
|
||||||
|
|
|
||||||
|
|
@ -764,8 +764,6 @@ class Message(MaybeInaccessibleMessage):
|
||||||
return ContentType.GIFT_UPGRADE_SENT
|
return ContentType.GIFT_UPGRADE_SENT
|
||||||
if self.paid_message_price_changed:
|
if self.paid_message_price_changed:
|
||||||
return ContentType.PAID_MESSAGE_PRICE_CHANGED
|
return ContentType.PAID_MESSAGE_PRICE_CHANGED
|
||||||
if self.sender_tag:
|
|
||||||
return ContentType.SENDER_TAG
|
|
||||||
if self.suggested_post_approved:
|
if self.suggested_post_approved:
|
||||||
return ContentType.SUGGESTED_POST_APPROVED
|
return ContentType.SUGGESTED_POST_APPROVED
|
||||||
if self.suggested_post_approval_failed:
|
if self.suggested_post_approval_failed:
|
||||||
|
|
|
||||||
|
|
@ -819,13 +819,6 @@ TEST_MESSAGE_PAID_MESSAGE_PRICE_CHANGED = Message(
|
||||||
paid_message_star_count=100,
|
paid_message_star_count=100,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
TEST_MESSAGE_SENDER_TAG = Message(
|
|
||||||
message_id=42,
|
|
||||||
date=datetime.datetime.now(),
|
|
||||||
chat=Chat(id=42, type="private"),
|
|
||||||
from_user=User(id=42, is_bot=False, first_name="Test"),
|
|
||||||
sender_tag="test-tag",
|
|
||||||
)
|
|
||||||
TEST_MESSAGE_SUGGESTED_POST_APPROVED = Message(
|
TEST_MESSAGE_SUGGESTED_POST_APPROVED = Message(
|
||||||
message_id=42,
|
message_id=42,
|
||||||
date=datetime.datetime.now(),
|
date=datetime.datetime.now(),
|
||||||
|
|
@ -939,7 +932,6 @@ MESSAGES_AND_CONTENT_TYPES = [
|
||||||
[TEST_MESSAGE_UNIQUE_GIFT, ContentType.UNIQUE_GIFT],
|
[TEST_MESSAGE_UNIQUE_GIFT, ContentType.UNIQUE_GIFT],
|
||||||
[TEST_MESSAGE_GIFT_UPGRADE_SENT, ContentType.GIFT_UPGRADE_SENT],
|
[TEST_MESSAGE_GIFT_UPGRADE_SENT, ContentType.GIFT_UPGRADE_SENT],
|
||||||
[TEST_MESSAGE_PAID_MESSAGE_PRICE_CHANGED, ContentType.PAID_MESSAGE_PRICE_CHANGED],
|
[TEST_MESSAGE_PAID_MESSAGE_PRICE_CHANGED, ContentType.PAID_MESSAGE_PRICE_CHANGED],
|
||||||
[TEST_MESSAGE_SENDER_TAG, ContentType.SENDER_TAG],
|
|
||||||
[TEST_MESSAGE_SUGGESTED_POST_APPROVED, ContentType.SUGGESTED_POST_APPROVED],
|
[TEST_MESSAGE_SUGGESTED_POST_APPROVED, ContentType.SUGGESTED_POST_APPROVED],
|
||||||
[TEST_MESSAGE_SUGGESTED_POST_APPROVAL_FAILED, ContentType.SUGGESTED_POST_APPROVAL_FAILED],
|
[TEST_MESSAGE_SUGGESTED_POST_APPROVAL_FAILED, ContentType.SUGGESTED_POST_APPROVAL_FAILED],
|
||||||
[TEST_MESSAGE_SUGGESTED_POST_DECLINED, ContentType.SUGGESTED_POST_DECLINED],
|
[TEST_MESSAGE_SUGGESTED_POST_DECLINED, ContentType.SUGGESTED_POST_DECLINED],
|
||||||
|
|
@ -1016,7 +1008,6 @@ MESSAGES_AND_COPY_METHODS = [
|
||||||
[TEST_MESSAGE_UNIQUE_GIFT, None],
|
[TEST_MESSAGE_UNIQUE_GIFT, None],
|
||||||
[TEST_MESSAGE_GIFT_UPGRADE_SENT, None],
|
[TEST_MESSAGE_GIFT_UPGRADE_SENT, None],
|
||||||
[TEST_MESSAGE_PAID_MESSAGE_PRICE_CHANGED, None],
|
[TEST_MESSAGE_PAID_MESSAGE_PRICE_CHANGED, None],
|
||||||
[TEST_MESSAGE_SENDER_TAG, None],
|
|
||||||
[TEST_MESSAGE_SUGGESTED_POST_APPROVED, None],
|
[TEST_MESSAGE_SUGGESTED_POST_APPROVED, None],
|
||||||
[TEST_MESSAGE_SUGGESTED_POST_APPROVAL_FAILED, None],
|
[TEST_MESSAGE_SUGGESTED_POST_APPROVAL_FAILED, None],
|
||||||
[TEST_MESSAGE_SUGGESTED_POST_DECLINED, None],
|
[TEST_MESSAGE_SUGGESTED_POST_DECLINED, None],
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue