reposter 24.2.0__tar.gz → 24.3.0__tar.gz

{reposter-24.2.0 → reposter-24.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reposter
-Version: 24.2.0
+Version: 24.3.0
 Summary: python script for reposting telegram messages
 Project-URL: repo, https://github.com/gmankab/reposter
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -29,7 +29,8 @@ userbot that forwards messages from telegram channels others in real time
 - [repo](https://github.com/gmankab/reposter)
 - [how to run](https://github.com/gmankab/reposter/blob/main/other/docs/run.md)
 - [how to build](https://github.com/gmankab/reposter/blob/main/other/docs/build.md)
-- [config and env](https://github.com/gmankab/reposter/blob/main/other/docs/config.md)
+- [config](https://github.com/gmankab/reposter/blob/main/other/docs/config.md)
+- [env](https://github.com/gmankab/reposter/blob/main/other/docs/env.md)
 - [pypi](https://pypi.org/project/reposter)
 
 

{reposter-24.2.0 → reposter-24.3.0}/pyproject.toml

@@ -6,7 +6,7 @@ dependencies = [
     'rich',
 ]
 name = 'reposter'
-version = '24.2.0'
+version = '24.3.0'
 description = 'python script for reposting telegram messages'
 readme = 'readme.md'
 requires-python = '>=3.11'

{reposter-24.2.0 → reposter-24.3.0}/readme.md

@@ -9,7 +9,8 @@ userbot that forwards messages from telegram channels others in real time
 - [repo](https://github.com/gmankab/reposter)
 - [how to run](https://github.com/gmankab/reposter/blob/main/other/docs/run.md)
 - [how to build](https://github.com/gmankab/reposter/blob/main/other/docs/build.md)
-- [config and env](https://github.com/gmankab/reposter/blob/main/other/docs/config.md)
+- [config](https://github.com/gmankab/reposter/blob/main/other/docs/config.md)
+- [env](https://github.com/gmankab/reposter/blob/main/other/docs/env.md)
 - [pypi](https://pypi.org/project/reposter)
 
 

{reposter-24.2.0 → reposter-24.3.0}/reposter/core/config.py

@@ -1,3 +1,6 @@
+import reposter.core.common
+
+
 class tests:
     source: str = '@autotests_source'
     target: str = '@autotests_target'
@@ -17,24 +20,28 @@ class env:
 
 
 class json:
+    app_version: str
     api_id: int
     api_hash: str
     tg_session: str
     drop_author: bool
     logs_chat: str | int
-    online_status_every_seconds: int
     stream_notify_chats: list
+    edit_timeout_seconds: int
+    online_status_every_seconds: int
     chats: dict
 
 
 default = {
+    'app_version': reposter.core.common.app.version,
     'api_id': 0,
     'api_hash': '',
     'tg_session': '',
     'drop_author': True,
     'logs_chat': 'me',
-    'online_status_every_seconds': 0,
     'stream_notify_chats': [],
+    'edit_timeout_seconds': 0,
+    'online_status_every_seconds': 0,
     'chats': {
         tests.source: tests.target,
     }

{reposter-24.2.0 → reposter-24.3.0}/reposter/core/types.py

@@ -22,6 +22,20 @@ media_other = typing.Union[
     pyrogram.types.Contact,
     pyrogram.types.Sticker,
 ]
+in_group_media = typing.Union[
+    pyrogram.types.Audio,
+    pyrogram.types.Photo,
+    pyrogram.types.Video,
+    pyrogram.types.Document,
+    pyrogram.types.Animation,
+]
+input_media = typing.Union[
+    pyrogram.types.InputMediaAudio,
+    pyrogram.types.InputMediaPhoto,
+    pyrogram.types.InputMediaVideo,
+    pyrogram.types.InputMediaDocument,
+    pyrogram.types.InputMediaAnimation,
+]
 
 
 class Progress(rich.progress.Progress):

{reposter-24.2.0 → reposter-24.3.0}/reposter/db/models.py

@@ -3,6 +3,7 @@ from tortoise import fields
 
 
 class Msg(Model):
+    hash = fields.TextField()
     src_msg = fields.IntField()
     src_chat = fields.IntField()
     target_msg = fields.IntField()

{reposter-24.2.0 → reposter-24.3.0}/reposter/funcs/other.py

@@ -4,6 +4,7 @@ import reposter.core.config
 import pyrogram.client
 import reposter.tg.save_file
 import reposter.db.init
+import hashlib
 import types
 import sys
 import io
@@ -79,3 +80,17 @@ def double_links(
 ) -> str:
     return f'[blue]{single_link(src_msg)}[/] -> [yellow]{single_link(target_msg)}[/]'
 
+
+def get_hash(
+    msg: pyrogram.types.Message,
+) -> str:
+    hash = hashlib.new('sha256')
+    if msg.text:
+        to_hash = msg.text.markdown.encode()
+    elif msg.caption:
+        to_hash = msg.caption.markdown.encode()
+    else:
+        return ''
+    hash.update(to_hash)
+    return hash.hexdigest()
+

{reposter-24.2.0 → reposter-24.3.0}/reposter/funcs/parse_conf.py

@@ -4,6 +4,15 @@ import json
 import os
 
 
+def compatibility_from_24_2_0_to_24_2_1(
+    db_path: Path,
+):
+    common.log(
+        f'removing {db_path} for compatibility'
+    )
+    db_path.unlink(missing_ok=True)
+
+
 def write_config(
     dict_to_write: dict,
 ) -> None:
@@ -25,6 +34,10 @@ def read_config() -> None:
             common.path.config_json.read_text()
         )
         assert isinstance(loaded_config, dict)
+        if 'app_version' not in loaded_config:
+            compatibility_from_24_2_0_to_24_2_1(
+                db_path=common.path.db_path,
+            )
         for key, value in config.default.items():
             if key not in loaded_config:
                 loaded_config[key] = value

{reposter-24.2.0 → reposter-24.3.0}/reposter/handlers/edit.py

@@ -1,6 +1,7 @@
 import reposter.funcs.logging
 import reposter.funcs.other
 import reposter.core.common
+import reposter.db.models
 import pyrogram.types
 
 
@@ -9,36 +10,46 @@ class Edit:
         self,
         src_msg: pyrogram.types.Message,
         target_msg: pyrogram.types.Message,
+        db_msg: reposter.db.models.Msg,
     ) -> None:
         self.src_msg = src_msg
         self.target_msg = target_msg
+        self.db_msg = db_msg
         self.links = reposter.funcs.other.double_links(
             src_msg=src_msg,
             target_msg=target_msg,
         )
 
-    def log(self) -> None:
+    async def log_and_save(self) -> None:
+        self.db_msg.hash = self.new_hash
+        await self.db_msg.save()
         reposter.funcs.logging.log_msg(
-            to_log='[green]\\[edit][/]',
+            to_log='[bright_cyan]\\[success edit][/]',
             src_msg=self.src_msg,
             target_msg=self.target_msg,
         )
 
     async def edit(self) -> None:
+        self.new_hash = reposter.funcs.other.get_hash(self.src_msg)
+        if self.db_msg.hash == self.new_hash:
+            reposter.core.common.log(
+                f'[yellow]\\[warn][/] can\'t see changes between {self.links}'
+            )
+            return
         if self.src_msg.text or self.target_msg.text:
             if self.src_msg.text.markdown != self.target_msg.text.markdown:
                 await self.target_msg.edit_text(self.src_msg.text.markdown)
-                return
+                return await self.log_and_save()
         if self.src_msg.caption or self.target_msg.caption:
             if not self.src_msg.caption:
                 await self.target_msg.edit_caption('')
-                return self.log()
+                return await self.log_and_save()
             if not self.target_msg.caption:
                 await self.target_msg.edit_caption(self.src_msg.caption.markdown)
-                return self.log()
+                return await self.log_and_save()
             if self.src_msg.caption.markdown != self.target_msg.caption.markdown:
                 await self.target_msg.edit_caption(self.src_msg.caption.markdown)
-                return self.log()
+                return await self.log_and_save()
         reposter.core.common.log(
             f'[yellow]\\[warn][/] can\'t see changes between {self.links}'
         )

reposter-24.3.0/reposter/handlers/forward_unrestricted.py

@@ -0,0 +1,87 @@
+import reposter.handlers.other
+import reposter.funcs.logging
+import reposter.funcs.handle
+import reposter.funcs.other
+import reposter.core.config
+import reposter.core.common
+import reposter.core.types
+import reposter.db.models
+import pyrogram.types
+
+
+class ForwardUnrestricted:
+    def __init__(
+        self,
+        target_any: reposter.core.types.target,
+        src_to_forward: pyrogram.types.Message,
+        src_in_db: pyrogram.types.Message,
+    ) -> None:
+        self.target_any: reposter.core.types.target = target_any
+        self.src_msg = src_to_forward
+        self.src_in_db: pyrogram.types.Message = src_in_db
+        assert isinstance(self.target_any, (str, int, list))
+
+    async def copy_all(
+        self,
+    ) -> None:
+        if self.src_msg.media_group_id:
+            to_call = self.copy_media_group
+        else:
+            to_call = self.copy_one
+        await reposter.handlers.other.parse_targets(
+            target_any=self.target_any,
+            to_call=to_call,
+        )
+
+    async def copy_one(
+        self,
+        target: str | int,
+    ) -> None:
+        target_msg = await reposter.funcs.handle.run_excepted(
+            self.src_msg.forward,
+            chat_id=target,
+            drop_author=reposter.core.config.json.drop_author,
+        )
+        assert isinstance(target_msg, pyrogram.types.Message)
+        await reposter.db.models.Msg.create(
+            hash = reposter.funcs.other.get_hash(self.src_msg),
+            src_msg=self.src_in_db.id,
+            src_chat=self.src_in_db.chat.id,
+            target_msg=target_msg.id,
+            target_chat=target_msg.chat.id
+        )
+        reposter.funcs.logging.log_msg(
+            to_log='[green]\\[success forward][/]',
+            src_msg=self.src_msg,
+            target_msg=target_msg,
+        )
+
+    async def copy_media_group(
+        self,
+        target: str | int,
+    ) -> None:
+        src_media_group = await self.src_msg.get_media_group()
+        if self.src_msg.id != src_media_group[0].id:
+            return
+        target_media_group = await reposter.core.common.tg.client.copy_media_group(
+            chat_id=target,
+            from_chat_id=self.src_msg.chat.id,
+            message_id=self.src_msg.id,
+        )
+        for src_msg, target_msg in zip(
+            src_media_group,
+            target_media_group,
+        ):
+            await reposter.db.models.Msg.create(
+                hash = reposter.funcs.other.get_hash(self.src_msg),
+                src_msg=src_msg.id,
+                src_chat=src_msg.chat.id,
+                target_msg=target_msg.id,
+                target_chat=target_msg.chat.id
+            )
+            reposter.funcs.logging.log_msg(
+                to_log='[green]\\[success forward media group][/]',
+                src_msg=src_msg,
+                target_msg=target_msg,
+            )
+

{reposter-24.2.0 → reposter-24.3.0}/reposter/handlers/on_msg.py

@@ -5,9 +5,11 @@ import reposter.handlers.service
 import reposter.handlers.edit
 import reposter.funcs.other
 import reposter.core.common
+import reposter.core.config
 import reposter.core.types
 import reposter.db.models
 import pyrogram.types
+import datetime
 
 
 class OnMsg:
@@ -40,18 +42,25 @@ class OnMsg:
                 await stream_notify.notify_all()
             return
         if src_msg.has_protected_content or src_msg.chat.has_protected_content:
-            real_time_resend = reposter.handlers.resend_restricted.ResendRestricted(
-                src_msg=src_msg,
-                target_any=self.target_any,
-            )
-            await real_time_resend.resend_all()
+            if src_msg.media_group_id:
+                resend_media_group = reposter.handlers.resend_restricted.ResendMediaGroup(
+                    src_msg=src_msg,
+                    target_any=self.target_any,
+                )
+                await resend_media_group.all()
+            else:
+                resend_one = reposter.handlers.resend_restricted.ResendOne(
+                    src_msg=src_msg,
+                    target_any=self.target_any,
+                )
+                await resend_one.all()
         else:
             real_time_forward = reposter.handlers.forward_unrestricted.ForwardUnrestricted(
                 target_any=self.target_any,
                 src_to_forward=src_msg,
                 src_in_db=src_msg,
             )
-            await real_time_forward.forward_all()
+            await real_time_forward.copy_all()
 
     async def on_edited_msg(
         self,
@@ -60,8 +69,16 @@ class OnMsg:
     ) -> None:
         link = reposter.funcs.other.single_link(src_msg)
         reposter.core.common.log(
-            f'[bright_cyan]\\[edited msg] [blue]{link}'
+            f'[bright_cyan]\\[new edit] [blue]{link}'
         )
+        if reposter.core.config.json.edit_timeout_seconds:
+            send_how_long_ago = src_msg.edit_date - src_msg.date
+            timeout = datetime.timedelta(seconds=reposter.core.config.json.edit_timeout_seconds)
+            if send_how_long_ago > timeout:
+                reposter.core.common.log(
+                    f'[yellow]\\[warn] [blue]{link} edited but send too long ago'
+                )
+                return
         db_msgs = await reposter.db.models.Msg.filter(
             src_msg=src_msg.id,
             src_chat=src_msg.chat.id
@@ -83,6 +100,7 @@ class OnMsg:
             edit = reposter.handlers.edit.Edit(
                 target_msg=target_msg,
                 src_msg=src_msg,
+                db_msg=db_msg,
             )
             await edit.edit()
 

reposter-24.3.0/reposter/handlers/resend_restricted.py

@@ -0,0 +1,154 @@
+import reposter.handlers.forward_unrestricted
+import reposter.handlers.other
+import reposter.funcs.handle
+import reposter.funcs.logging
+import reposter.funcs.other
+import reposter.core.config
+import reposter.core.common
+import reposter.core.types
+import reposter.tg.restricted
+import reposter.db.models
+import pyrogram.types
+
+
+class ResendOne:
+    def __init__(
+        self,
+        target_any: reposter.core.types.target,
+        src_msg: pyrogram.types.Message,
+    ) -> None:
+        self.target_any: reposter.core.types.target = target_any
+        self.src_msg = src_msg
+        assert isinstance(self.target_any, (str, int, list))
+
+    async def all(self):
+        if isinstance(self.target_any, list):
+            await self.multiple_targets()
+        elif isinstance(self.target_any, (str, int)):
+            await self.one_target(
+                target=self.target_any,
+                save_db=True,
+            )
+        else:
+            raise AssertionError
+
+    async def multiple_targets(self) -> None:
+        assert reposter.core.config.json.logs_chat
+        resent_to_log_chat = await self.one_target(
+            target=reposter.core.config.json.logs_chat,
+            save_db=False,
+        )
+        real_time_forward = reposter.handlers.forward_unrestricted.ForwardUnrestricted(
+            target_any=self.target_any,
+            src_to_forward=resent_to_log_chat,
+            src_in_db=self.src_msg,
+        )
+        await real_time_forward.copy_all()
+
+    async def one_target(
+        self,
+        target: str | int,
+        save_db: bool,
+    ) -> pyrogram.types.Message:
+        resender = reposter.tg.restricted.Resender(
+            src_msg=self.src_msg,
+            target_chat=target,
+        )
+        target_msg = await reposter.funcs.handle.run_excepted(
+            resender.resend_anything,
+        )
+        assert target_msg
+        reposter.funcs.logging.log_msg(
+            to_log='[green]\\[success resend][/]',
+            src_msg=self.src_msg,
+            target_msg=target_msg,
+        )
+        if save_db:
+            await reposter.db.models.Msg.create(
+                hash = reposter.funcs.other.get_hash(self.src_msg),
+                src_msg=self.src_msg.id,
+                src_chat=self.src_msg.chat,
+                target_msg=target_msg.id,
+                target_chat=target_msg.chat.id
+            )
+        return target_msg
+
+
+
+class ResendMediaGroup:
+    def __init__(
+        self,
+        target_any: reposter.core.types.target,
+        src_msg: pyrogram.types.Message,
+    ) -> None:
+        self.target_any: reposter.core.types.target = target_any
+        self.src_msg = src_msg
+        self.media: list[reposter.core.types.input_media] = []
+        self.src_media_group: list[pyrogram.types.Message]
+        assert isinstance(self.target_any, (str, int, list))
+
+    async def all(self) -> None:
+        self.src_media_group = await self.src_msg.get_media_group()
+        if self.src_msg.id != self.src_media_group[0].id:
+            return
+        for src_msg in self.src_media_group:
+            self.media.append(
+                await self.get_media(src_msg)
+            )
+        await reposter.handlers.other.parse_targets(
+            target_any=self.target_any,
+            to_call=self.one_target,
+        )
+
+    async def one_target(
+        self,
+        target: str | int,
+    ):
+        target_media_group = await reposter.core.common.tg.client.send_media_group(
+            chat_id=target,
+            media=self.media,
+        )
+        for src_msg, target_msg in zip(
+            self.src_media_group,
+            target_media_group,
+        ):
+            await reposter.db.models.Msg.create(
+                hash = reposter.funcs.other.get_hash(self.src_msg),
+                src_msg=src_msg.id,
+                src_chat=src_msg.chat.id,
+                target_msg=target_msg.id,
+                target_chat=target_msg.chat.id
+            )
+            reposter.funcs.logging.log_msg(
+                to_log='[green]\\[success resend media group][/]',
+                src_msg=src_msg,
+                target_msg=target_msg,
+            )
+
+    async def get_media(
+        self,
+        src_msg: pyrogram.types.Message,
+    ) -> reposter.core.types.input_media:
+        resend_one = ResendOne(
+            target_any=reposter.core.config.json.logs_chat,
+            src_msg=src_msg,
+        )
+        resent_to_log_chat = await resend_one.one_target(
+            target=reposter.core.config.json.logs_chat,
+            save_db=False,
+        )
+        if resent_to_log_chat.caption:
+            caption: str = resent_to_log_chat.caption.markdown
+        else:
+            caption: str = ''
+        media_value = str(resent_to_log_chat.media.value)
+        media = getattr(resent_to_log_chat, media_value)
+        assert isinstance(media, reposter.core.types.in_group_media)
+        input_media = getattr(pyrogram.types, 'InputMedia' + media_value.capitalize())
+        inputted = input_media(
+            media=media.file_id,
+            caption=caption
+        )
+        assert isinstance(inputted, reposter.core.types.input_media)
+        return inputted
+

{reposter-24.2.0 → reposter-24.3.0}/reposter/handlers/service.py

@@ -37,7 +37,7 @@ class Service:
         )
         assert isinstance(target_msg, pyrogram.types.Message)
         reposter.funcs.logging.log_msg(
-            to_log=f'[green]\\[service][/] {text}',
+            to_log=f'[green]\\[success service][/] {text}',
             src_msg=self.src_msg,
             target_msg=target_msg,
         )

{reposter-24.2.0 → reposter-24.3.0}/reposter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reposter
-Version: 24.2.0
+Version: 24.3.0
 Summary: python script for reposting telegram messages
 Project-URL: repo, https://github.com/gmankab/reposter
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -29,7 +29,8 @@ userbot that forwards messages from telegram channels others in real time
 - [repo](https://github.com/gmankab/reposter)
 - [how to run](https://github.com/gmankab/reposter/blob/main/other/docs/run.md)
 - [how to build](https://github.com/gmankab/reposter/blob/main/other/docs/build.md)
-- [config and env](https://github.com/gmankab/reposter/blob/main/other/docs/config.md)
+- [config](https://github.com/gmankab/reposter/blob/main/other/docs/config.md)
+- [env](https://github.com/gmankab/reposter/blob/main/other/docs/env.md)
 - [pypi](https://pypi.org/project/reposter)
 
 

reposter-24.2.0/reposter/handlers/forward_unrestricted.py

@@ -1,51 +0,0 @@
-import reposter.handlers.other
-import reposter.funcs.logging
-import reposter.funcs.handle
-import reposter.core.config
-import reposter.core.types
-import reposter.db.models
-import pyrogram.types
-
-
-class ForwardUnrestricted:
-    def __init__(
-        self,
-        target_any: reposter.core.types.target,
-        src_to_forward: pyrogram.types.Message,
-        src_in_db: pyrogram.types.Message,
-    ) -> None:
-        self.target_any: reposter.core.types.target = target_any
-        self.src_msg = src_to_forward
-        self.src_in_db: pyrogram.types.Message = src_in_db
-        assert isinstance(self.target_any, (str, int, list))
-
-    async def forward_all(
-        self,
-    ) -> None:
-        await reposter.handlers.other.parse_targets(
-            target_any=self.target_any,
-            to_call=self.forward_one,
-        )
-
-    async def forward_one(
-        self,
-        target: str | int,
-    ) -> None:
-        target_msg = await reposter.funcs.handle.run_excepted(
-            self.src_msg.forward,
-            chat_id=target,
-            drop_author=reposter.core.config.json.drop_author,
-        )
-        assert isinstance(target_msg, pyrogram.types.Message)
-        await reposter.db.models.Msg.create(
-            src_msg=self.src_in_db.id,
-            src_chat=self.src_in_db.chat.id,
-            target_msg=target_msg.id,
-            target_chat=target_msg.chat.id
-        )
-        reposter.funcs.logging.log_msg(
-            to_log='[green]\\[forward][/]',
-            src_msg=self.src_msg,
-            target_msg=target_msg,
-        )
-

reposter-24.2.0/reposter/handlers/resend_restricted.py

@@ -1,68 +0,0 @@
-import reposter.handlers.forward_unrestricted
-import reposter.funcs.handle
-import reposter.funcs.logging
-import reposter.core.config
-import reposter.core.types
-import reposter.tg.restricted
-import reposter.db.models
-import pyrogram.types
-
-
-class ResendRestricted:
-    def __init__(
-        self,
-        target_any: reposter.core.types.target,
-        src_msg: pyrogram.types.Message,
-    ) -> None:
-        self.target_any: reposter.core.types.target = target_any
-        self.src_msg = src_msg
-        assert isinstance(self.target_any, (str, int, list))
-
-    async def resend_all(self) -> None:
-        if isinstance(self.target_any, list):
-            assert reposter.core.config.json.logs_chat
-            resent_to_log_chat = await reposter.funcs.handle.run_excepted(
-                self.resend_one,
-                src_msg=self.src_msg,
-                target=reposter.core.config.json.logs_chat,
-            )
-            real_time_forward = reposter.handlers.forward_unrestricted.ForwardUnrestricted(
-                target_any=self.target_any,
-                src_to_forward=resent_to_log_chat,
-                src_in_db=self.src_msg,
-            )
-            return await real_time_forward.forward_all()
-        elif isinstance(self.target_any, (str, int)):
-            target_msg = await self.resend_one(
-                src_msg=self.src_msg,
-                target=self.target_any,
-            )
-            await reposter.db.models.Msg.create(
-                src_msg=self.src_msg.id,
-                src_chat=self.src_msg.chat,
-                target_msg=target_msg.id,
-                target_chat=target_msg.chat.id
-            )
-        else:
-            raise AssertionError
-
-    async def resend_one(
-        self,
-        src_msg: pyrogram.types.Message,
-        target: str | int,
-    ) -> pyrogram.types.Message:
-        resender = reposter.tg.restricted.Resender(
-            src_msg=self.src_msg,
-            target_chat=target,
-        )
-        target_msg = await reposter.funcs.handle.run_excepted(
-            resender.resend_anything,
-        )
-        assert target_msg
-        reposter.funcs.logging.log_msg(
-            to_log='[green]\\[resend][/]',
-            src_msg=src_msg,
-            target_msg=target_msg,
-        )
-        return target_msg
-