mirror of
https://github.com/aiogram/aiogram.git
synced 2026-04-08 16:37:47 +00:00
Remove init, add property for renamed field
This commit is contained in:
latan
parent
f70c97e9fa
commit
1975232a43
7 changed files with 34 additions and 214 deletions
|
|
@ -1,5 +1,3 @@
|
|||
import typing
|
||||
|
||||
from . import base
|
||||
from . import fields
|
||||
from . import mixins
|
||||
|
|
@ -21,39 +19,14 @@ class Animation(base.TelegramObject, mixins.Downloadable):
|
|||
width: base.Integer = fields.Field()
|
||||
height: base.Integer = fields.Field()
|
||||
duration: base.Integer = fields.Field()
|
||||
thumb: PhotoSize = fields.Field(base=PhotoSize) # Deprecated
|
||||
thumbnail: PhotoSize = fields.Field(base=PhotoSize)
|
||||
file_name: base.String = fields.Field()
|
||||
mime_type: base.String = fields.Field()
|
||||
file_size: base.Integer = fields.Field()
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
file_id: base.String,
|
||||
file_unique_id: base.String,
|
||||
width: base.Integer,
|
||||
height: base.Integer,
|
||||
duration: base.Integer,
|
||||
thumb: typing.Optional[PhotoSize] = None,
|
||||
thumbnail: typing.Optional[PhotoSize] = None,
|
||||
file_name: typing.Optional[base.String] = None,
|
||||
mime_type: typing.Optional[base.String] = None,
|
||||
file_size: typing.Optional[base.Integer] = None,
|
||||
):
|
||||
if not thumbnail and thumb:
|
||||
thumbnail = thumb
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
|
||||
super().__init__(
|
||||
file_id=file_id,
|
||||
file_unique_id=file_unique_id,
|
||||
width=width,
|
||||
height=height,
|
||||
duration=duration,
|
||||
thumbnail=thumbnail,
|
||||
file_name=file_name,
|
||||
mime_type=mime_type,
|
||||
file_size=file_size,
|
||||
@property
|
||||
def thumb(self):
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
return self.thumbnail
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
import typing
|
||||
|
||||
from . import base
|
||||
from . import fields
|
||||
from . import mixins
|
||||
|
|
@ -21,36 +19,11 @@ class Audio(base.TelegramObject, mixins.Downloadable):
|
|||
file_name: base.String = fields.Field()
|
||||
mime_type: base.String = fields.Field()
|
||||
file_size: base.Integer = fields.Field()
|
||||
thumb: PhotoSize = fields.Field(base=PhotoSize) # Deprecated
|
||||
thumbnail: PhotoSize = fields.Field(base=PhotoSize)
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
file_id: base.String,
|
||||
file_unique_id: base.String,
|
||||
duration: base.Integer,
|
||||
performer: typing.Optional[base.String] = None,
|
||||
title: typing.Optional[base.String] = None,
|
||||
file_name: typing.Optional[base.String] = None,
|
||||
mime_type: typing.Optional[base.String] = None,
|
||||
file_size: typing.Optional[base.Integer] = None,
|
||||
thumb: typing.Optional[PhotoSize] = None,
|
||||
thumbnail: typing.Optional[PhotoSize] = None,
|
||||
):
|
||||
if not thumbnail and thumb:
|
||||
thumbnail = thumb
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
|
||||
super().__init__(
|
||||
file_id=file_id,
|
||||
file_unique_id=file_unique_id,
|
||||
duration=duration,
|
||||
performer=performer,
|
||||
title=title,
|
||||
file_name=file_name,
|
||||
mime_type=mime_type,
|
||||
file_size=file_size,
|
||||
thumbnail=thumbnail,
|
||||
@property
|
||||
def thumb(self):
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
return self.thumbnail
|
||||
|
|
|
|||
|
|
@ -16,36 +16,15 @@ class Document(base.TelegramObject, mixins.Downloadable):
|
|||
"""
|
||||
file_id: base.String = fields.Field()
|
||||
file_unique_id: base.String = fields.Field()
|
||||
thumb: PhotoSize = fields.Field(base=PhotoSize) # Deprecated
|
||||
thumbnail: PhotoSize = fields.Field(base=PhotoSize)
|
||||
file_name: base.String = fields.Field()
|
||||
mime_type: base.String = fields.Field()
|
||||
file_size: base.Integer = fields.Field()
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
file_id: base.String,
|
||||
file_unique_id: base.String,
|
||||
thumb: typing.Optional[PhotoSize] = None,
|
||||
thumbnail: typing.Optional[PhotoSize] = None,
|
||||
file_name: typing.Optional[base.String] = None,
|
||||
mime_type: typing.Optional[base.String] = None,
|
||||
file_size: typing.Optional[base.Integer] = None,
|
||||
):
|
||||
if not thumbnail and thumb:
|
||||
thumbnail = thumb
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
|
||||
super().__init__(
|
||||
file_id=file_id,
|
||||
file_unique_id=file_unique_id,
|
||||
thumbnail=thumbnail,
|
||||
file_name=file_name,
|
||||
mime_type=mime_type,
|
||||
file_size=file_size,
|
||||
)
|
||||
@property
|
||||
def thumb(self):
|
||||
warn_deprecated('thumb is deprecated, use thumbnail instead')
|
||||
return self.thumbnail
|
||||
|
||||
@property
|
||||
def mime_base(self) -> str:
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ import typing
|
|||
from . import base
|
||||
from . import fields
|
||||
from . import mixins
|
||||
from .file import File
|
||||
from .mask_position import MaskPosition
|
||||
from .photo_size import PhotoSize
|
||||
from .file import File
|
||||
from ..utils.deprecated import warn_deprecated
|
||||
|
||||
|
||||
|
|
@ -22,7 +22,6 @@ class Sticker(base.TelegramObject, mixins.Downloadable):
|
|||
height: base.Integer = fields.Field()
|
||||
is_animated: base.Boolean = fields.Field()
|
||||
is_video: base.Boolean = fields.Field()
|
||||
thumb: PhotoSize = fields.Field(base=PhotoSize)
|
||||
thumbnail: PhotoSize = fields.Field(base=PhotoSize)
|
||||
emoji: base.String = fields.Field()
|
||||
set_name: base.String = fields.Field()
|
||||
|
|
@ -32,48 +31,12 @@ class Sticker(base.TelegramObject, mixins.Downloadable):
|
|||
needs_repainting: base.Boolean = fields.Field()
|
||||
file_size: base.Integer = fields.Field()
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
file_id: base.String,
|
||||
file_unique_id: base.String,
|
||||
type: base.String,
|
||||
width: base.Integer,
|
||||
height: base.Integer,
|
||||
is_animated: base.Boolean,
|
||||
is_video: base.Boolean,
|
||||
thumb: typing.Optional[PhotoSize] = None,
|
||||
thumbnail: typing.Optional[PhotoSize] = None,
|
||||
emoji: typing.Optional[base.String] = None,
|
||||
set_name: typing.Optional[base.String] = None,
|
||||
premium_animation: typing.Optional[File] = None,
|
||||
mask_position: typing.Optional[MaskPosition] = None,
|
||||
custom_emoji_id: typing.Optional[base.String] = None,
|
||||
needs_repainting: typing.Optional[base.Boolean] = None,
|
||||
file_size: typing.Optional[base.Integer] = None,
|
||||
):
|
||||
if thumb is not None:
|
||||
warn_deprecated(
|
||||
"The 'thumb' parameter is deprecated, use 'thumbnail' instead."
|
||||
)
|
||||
thumbnail = thumb
|
||||
|
||||
super().__init__(
|
||||
file_id=file_id,
|
||||
file_unique_id=file_unique_id,
|
||||
type=type,
|
||||
width=width,
|
||||
height=height,
|
||||
is_animated=is_animated,
|
||||
is_video=is_video,
|
||||
thumbnail=thumbnail,
|
||||
emoji=emoji,
|
||||
set_name=set_name,
|
||||
premium_animation=premium_animation,
|
||||
mask_position=mask_position,
|
||||
custom_emoji_id=custom_emoji_id,
|
||||
needs_repainting=needs_repainting,
|
||||
file_size=file_size,
|
||||
@property
|
||||
def thumb(self) -> typing.Optional[PhotoSize]:
|
||||
warn_deprecated(
|
||||
"The 'thumb' property is deprecated, use 'thumbnail' instead."
|
||||
)
|
||||
return self.thumbnail
|
||||
|
||||
async def set_position_in_set(self, position: base.Integer) -> base.Boolean:
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -20,34 +20,9 @@ class StickerSet(base.TelegramObject):
|
|||
is_video: base.Boolean = fields.Field()
|
||||
contains_masks: base.Boolean = fields.Field() # Deprecated
|
||||
stickers: typing.List[Sticker] = fields.ListField(base=Sticker)
|
||||
thumb: PhotoSize = fields.Field(base=PhotoSize) # Deprecated
|
||||
thumbnail: PhotoSize = fields.Field(base=PhotoSize)
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
name: base.String,
|
||||
title: base.String,
|
||||
sticker_type: base.String,
|
||||
is_animated: base.Boolean,
|
||||
is_video: base.Boolean,
|
||||
contains_masks: typing.Optional[base.Boolean] = None,
|
||||
stickers: typing.List[Sticker] = None,
|
||||
thumb: typing.Optional[PhotoSize] = None,
|
||||
thumbnail: typing.Optional[PhotoSize] = None,
|
||||
):
|
||||
if not thumbnail and thumb:
|
||||
thumbnail = thumb
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
|
||||
super().__init__(
|
||||
name=name,
|
||||
title=title,
|
||||
sticker_type=sticker_type,
|
||||
is_animated=is_animated,
|
||||
is_video=is_video,
|
||||
contains_masks=contains_masks,
|
||||
stickers=stickers,
|
||||
thumbnail=thumbnail,
|
||||
)
|
||||
@property
|
||||
def thumb(self):
|
||||
warn_deprecated('thumb is deprecated, use thumbnail instead')
|
||||
return self.thumbnail
|
||||
|
|
|
|||
|
|
@ -18,39 +18,15 @@ class Video(base.TelegramObject, mixins.Downloadable):
|
|||
width: base.Integer = fields.Field()
|
||||
height: base.Integer = fields.Field()
|
||||
duration: base.Integer = fields.Field()
|
||||
thumb: PhotoSize = fields.Field(base=PhotoSize) # Deprecated
|
||||
thumbnail: PhotoSize = fields.Field(base=PhotoSize)
|
||||
file_name: base.String = fields.Field()
|
||||
mime_type: base.String = fields.Field()
|
||||
file_size: base.Integer = fields.Field()
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
file_id: base.String,
|
||||
file_unique_id: base.String,
|
||||
width: base.Integer,
|
||||
height: base.Integer,
|
||||
duration: base.Integer,
|
||||
thumb: typing.Optional[PhotoSize] = None,
|
||||
thumbnail: typing.Optional[PhotoSize] = None,
|
||||
file_name: typing.Optional[base.String] = None,
|
||||
mime_type: typing.Optional[base.String] = None,
|
||||
file_size: typing.Optional[base.Integer] = None,
|
||||
):
|
||||
if not thumbnail and thumb:
|
||||
thumbnail = thumb
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
|
||||
super().__init__(
|
||||
file_id=file_id,
|
||||
file_unique_id=file_unique_id,
|
||||
width=width,
|
||||
height=height,
|
||||
duration=duration,
|
||||
thumbnail=thumbnail,
|
||||
file_name=file_name,
|
||||
mime_type=mime_type,
|
||||
file_size=file_size,
|
||||
@property
|
||||
def thumb(self):
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
return self.thumbnail
|
||||
|
|
|
|||
|
|
@ -17,31 +17,12 @@ class VideoNote(base.TelegramObject, mixins.Downloadable):
|
|||
file_unique_id: base.String = fields.Field()
|
||||
length: base.Integer = fields.Field()
|
||||
duration: base.Integer = fields.Field()
|
||||
thumb: PhotoSize = fields.Field(base=PhotoSize) # Deprecated
|
||||
thumbnail: PhotoSize = fields.Field(base=PhotoSize)
|
||||
file_size: base.Integer = fields.Field()
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
file_id: base.String,
|
||||
file_unique_id: base.String,
|
||||
length: base.Integer,
|
||||
duration: base.Integer,
|
||||
thumb: typing.Optional[PhotoSize] = None,
|
||||
thumbnail: typing.Optional[PhotoSize] = None,
|
||||
file_size: typing.Optional[base.Integer] = None,
|
||||
):
|
||||
if not thumbnail and thumb:
|
||||
thumbnail = thumb
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
|
||||
super().__init__(
|
||||
file_id=file_id,
|
||||
file_unique_id=file_unique_id,
|
||||
length=length,
|
||||
duration=duration,
|
||||
thumbnail=thumbnail,
|
||||
file_size=file_size,
|
||||
@property
|
||||
def thumb(self):
|
||||
warn_deprecated(
|
||||
"thumb is deprecated. Use thumbnail instead",
|
||||
)
|
||||
return self.thumbnail
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue