diff --git a/reposter/autotests/restricted.py b/reposter/autotests/restricted.py index ab6069d..765722e 100644 --- a/reposter/autotests/restricted.py +++ b/reposter/autotests/restricted.py @@ -8,10 +8,10 @@ async def restricted( - source_msg: pyrogram.types.Message + src_msg: pyrogram.types.Message ) -> str: resender = reposter.tg.restricted.Resender( - source_msg=source_msg, + src_msg=src_msg, target_chat=reposter.core.config.tests.target, ) try: @@ -24,7 +24,7 @@ async def restricted( except pyrogram.errors.PremiumAccountRequired: return f'preium required {resender.link}' links = reposter.funcs.other.double_links( - source_msg=source_msg, + src_msg=src_msg, target_msg=target_msg, ) return f'restrict=True {resender.media_value} {links}' diff --git a/reposter/autotests/unrestricted.py b/reposter/autotests/unrestricted.py index 6c9b3bf..a43c98d 100644 --- a/reposter/autotests/unrestricted.py +++ b/reposter/autotests/unrestricted.py @@ -6,20 +6,20 @@ async def unrestricted( - source_msg: pyrogram.types.Message, + src_msg: pyrogram.types.Message, drop_author: bool, ) -> str: target_msg = await reposter.funcs.handle.run_excepted( - source_msg.forward, + src_msg.forward, chat_id=reposter.core.config.tests.target, drop_author=drop_author, ) - if source_msg.media: - media = source_msg.media.value + if src_msg.media: + media = src_msg.media.value else: media = 'no_media' links = reposter.funcs.other.double_links( - source_msg=source_msg, + src_msg=src_msg, target_msg=target_msg, ) return f'restrict=False drop={drop_author} {media} {links}' diff --git a/reposter/funcs/logging.py b/reposter/funcs/logging.py index 5c39948..df263e5 100644 --- a/reposter/funcs/logging.py +++ b/reposter/funcs/logging.py @@ -72,21 +72,21 @@ def write_error( def log_msg( to_log: str, - source_msg: pyrogram.types.Message, + src_msg: pyrogram.types.Message, target_msg: pyrogram.types.Message, ): links = reposter.funcs.other.double_links( - source_msg=source_msg, + src_msg=src_msg, target_msg=target_msg, ) to_log += f' {links}' - if source_msg.media: - to_log += f' media={source_msg.media.value}' + if src_msg.media: + to_log += f' media={src_msg.media.value}' to_add = '' - if source_msg.text: - to_add = source_msg.text - elif source_msg.caption: - to_add = source_msg.caption + if src_msg.text: + to_add = src_msg.text + elif src_msg.caption: + to_add = src_msg.caption if to_add: if len(to_add) > 30: to_add = f'{to_add[:30]}…' diff --git a/reposter/funcs/other.py b/reposter/funcs/other.py index bde3a02..1ecab82 100644 --- a/reposter/funcs/other.py +++ b/reposter/funcs/other.py @@ -74,8 +74,8 @@ def single_link( def double_links( - source_msg: pyrogram.types.Message, + src_msg: pyrogram.types.Message, target_msg: pyrogram.types.Message, ) -> str: - return f'[blue]{single_link(source_msg)}[/] -> [yellow]{single_link(target_msg)}[/]' + return f'[blue]{single_link(src_msg)}[/] -> [yellow]{single_link(target_msg)}[/]' diff --git a/reposter/handlers/forward_unrestricted.py b/reposter/handlers/forward_unrestricted.py index 72e6978..04f3682 100644 --- a/reposter/handlers/forward_unrestricted.py +++ b/reposter/handlers/forward_unrestricted.py @@ -45,7 +45,7 @@ async def forward_one( ) reposter.funcs.logging.log_msg( to_log='[green]\\[forward][/]', - source_msg=self.src_msg, + src_msg=self.src_msg, target_msg=target_msg, ) diff --git a/reposter/handlers/resend_restricted.py b/reposter/handlers/resend_restricted.py index 2979288..748c5c8 100644 --- a/reposter/handlers/resend_restricted.py +++ b/reposter/handlers/resend_restricted.py @@ -52,7 +52,7 @@ async def resend_one( target: str | int, ) -> pyrogram.types.Message: resender = reposter.tg.restricted.Resender( - source_msg=self.src_msg, + src_msg=self.src_msg, target_chat=target, ) target_msg = await reposter.funcs.handle.run_excepted( @@ -61,7 +61,7 @@ async def resend_one( assert target_msg reposter.funcs.logging.log_msg( to_log='[green]\\[resend][/]', - source_msg=src_msg, + src_msg=src_msg, target_msg=target_msg, ) return target_msg diff --git a/reposter/handlers/service.py b/reposter/handlers/service.py index cfbf3ec..17348f9 100644 --- a/reposter/handlers/service.py +++ b/reposter/handlers/service.py @@ -38,7 +38,7 @@ async def service_one( assert isinstance(target_msg, pyrogram.types.Message) reposter.funcs.logging.log_msg( to_log=f'[green]\\[service][/] {text}', - source_msg=self.src_msg, + src_msg=self.src_msg, target_msg=target_msg, ) diff --git a/reposter/tg/restricted.py b/reposter/tg/restricted.py index 1d2d682..6826eec 100644 --- a/reposter/tg/restricted.py +++ b/reposter/tg/restricted.py @@ -13,10 +13,10 @@ class Resender(): def __init__( self, - source_msg: pyrogram.types.Message, + src_msg: pyrogram.types.Message, target_chat: int | str, ) -> None: - self.msg: pyrogram.types.Message = source_msg + self.msg: pyrogram.types.Message = src_msg self.client: pyrogram.client.Client = reposter.core.common.tg.client self.task_id: rich.progress.TaskID self.target_chat: int | str = target_chat