Merge pull request #117 from aahnik/dev

Make delete sync optional and fix whitelist issue

plugins/tgcf_filter/__init__.py

@@ -23,7 +23,7 @@ def __init__(self, data):
 
     def modify(self, message):
         msg_text = message.text
-        if not msg_text:
+        if not msg_text and self.filters.text.whitelist == []:
             return message
 
         if self.text_safe(msg_text, self.filters.text):

plugins/tgcf_ocr/__init__.py

@@ -0,0 +1,9 @@
+
+class TgcfOcr:
+    id = "ocr"
+
+    def __init__(self, data) -> None:
+        pass
+
+    def modify(self, message):
+        pass

plugins/tgcf_watermark/__init__.py

@@ -0,0 +1,9 @@
+
+class TgcfWatermark:
+    id = "watermark"
+
+    def __init__(self, data) -> None:
+        pass
+
+    def modify(self, message):
+        pass

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tgcf"
-version = "0.1.25.post1"
+version = "0.1.26"
 description = "The ultimate tool to automate telegram message forwarding."
 authors = ["aahnik <[email protected]>"]
 license = "MIT"
@@ -11,6 +11,8 @@ packages = [
     { include = "tgcf"},
     { include = "tgcf_filter", from = "plugins" },
     { include = "tgcf_replace", from = "plugins" },
+    { include = "tgcf_watermark", from = "plugins" },
+    { include = "tgcf_ocr", from = "plugins" },
 ]
 
 [tool.poetry.dependencies]

tgcf/config.py

@@ -3,7 +3,7 @@
 import logging
 import os
 import sys
-from typing import Dict, List, Optional,Union
+from typing import Dict, List, Optional, Union
 
 import yaml
 from pydantic import BaseModel
@@ -14,14 +14,20 @@
 
 
 class Forward(BaseModel):
-    source: Union[int,str]
-    dest: List[Union[int,str]]
+    source: Union[int, str]
+    dest: List[Union[int, str]]
     offset: Optional[int] = 0
 
 
+class LiveSettings(BaseModel):
+    delete_sync: Optional[bool] = False
+
+
 class Config(BaseModel):
     forwards: List[Forward]
     show_forwarded_from: Optional[bool] = False
+    live: Optional[LiveSettings] = LiveSettings()
+
     plugins: Optional[Dict] = {}
 
 
@@ -51,7 +57,7 @@ def detect_config_type() -> int:
 CONFIG_TYPE = detect_config_type()
 
 
-def read_config_file():
+def read_config_file()->Config:
     if CONFIG_TYPE == 1:
         with open(CONFIG_FILE_NAME) as file:
             config_dict = yaml.full_load(file)

tgcf/live.py

@@ -128,7 +128,9 @@ async def deleted_message_handler(event):
 def start_sync():
     client = TelegramClient(SESSION, API_ID, API_HASH)
     for key, val in ALL_EVENTS.items():
-        logging.info(f"Added event handler for {key}")
+        if CONFIG.live.delete_sync is False and key == "deleted":
+            continue
         client.add_event_handler(*val)
+        logging.info(f"Added event handler for {key}")
     client.start()
     client.run_until_disconnected()