Skip to content

Commit

Permalink
[r] refactor src_msg
Browse files Browse the repository at this point in the history
  • Loading branch information
gmankab committed Sep 1, 2024
1 parent d947e83 commit 53f06ca
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions reposter/autotests/restricted.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}'
Expand Down
10 changes: 5 additions & 5 deletions reposter/autotests/unrestricted.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
Expand Down
16 changes: 8 additions & 8 deletions reposter/funcs/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 target_msg.media:
to_log += f' media={target_msg.media.value}'
to_add = ''
if source_msg.text:
to_add = source_msg.text
elif source_msg.caption:
to_add = source_msg.caption
if target_msg.text:
to_add = target_msg.text
elif target_msg.caption:
to_add = target_msg.caption
if to_add:
if len(to_add) > 30:
to_add = f'{to_add[:30]}…'
Expand Down
4 changes: 2 additions & 2 deletions reposter/funcs/other.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)}[/]'

2 changes: 1 addition & 1 deletion reposter/handlers/forward_unrestricted.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

4 changes: 2 additions & 2 deletions reposter/handlers/resend_restricted.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion reposter/handlers/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

4 changes: 2 additions & 2 deletions reposter/tg/restricted.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 53f06ca

Please sign in to comment.