From ebeff15466030dfa5eb58d852a34a3ced4f78c46 Mon Sep 17 00:00:00 2001
From: "andrew (from workstation)" <localhost@arch>
Date: Mon, 4 Nov 2019 15:08:33 +0100
Subject: [PATCH] fix json

---
 tasks/channel_history.py | 62 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/tasks/channel_history.py b/tasks/channel_history.py
index f7a545e..3f498ce 100644
--- a/tasks/channel_history.py
+++ b/tasks/channel_history.py
@@ -1,5 +1,6 @@
 import pyrogram
 import aiohttp
+import json
 
 from async_worker.async_worker import AsyncTask
 from pyrogram.api.types import ChannelMessagesFilterEmpty
@@ -9,17 +10,69 @@ from pyrogram.api.functions.updates.get_channel_difference import GetChannelDiff
 from pyrogram.client.types.messages_and_media import Message as MessagePyrogram
 
 
+class JsonSerializerFixes:
+    @staticmethod
+    def user(obj):
+        obj.type = "private"
+        return obj
+
+    @staticmethod
+    def user_type(obj):
+        obj.type = "channel" if obj.id < 0 else "private"
+        return obj
+
+
+class JsonSerializer:
+    fixes = {
+        "from_user": {
+            "new_name": "from",
+            "patch": JsonSerializerFixes.user
+        },
+
+        "user": {
+            "new_name": "user",
+            "patch": JsonSerializerFixes.user_type
+        }
+    }
+
+    @staticmethod
+    def default(obj):
+        if isinstance(obj, bytes):
+            return repr(obj)
+
+        cls = JsonSerializer
+        result = {}
+
+        for name in filter(lambda x: not x.startswith("_"), obj.__dict__):
+            value = getattr(obj, name)
+
+            if value is None:
+                continue
+
+            if name in cls.fixes:
+                value = cls.fixes[name]["patch"](value)
+                name = cls.fixes[name]["new_name"]
+
+            result[name] = value
+
+        return result
+
+
 class ChannelHistoryReadTask(AsyncTask):
     channel: pyrogram.Chat
     client: pyrogram.Client
     pts: int
     webhook: str
+    http: aiohttp.ClientSession
+
+    seq_no: int = 0  # global mutable
 
     def setup(self, client: pyrogram.Client, channel: pyrogram.Chat, webhook: str):
         self.client = client
         self.channel = channel
         self.pts = False
         self.webhook = webhook
+        self.http = aiohttp.ClientSession()
 
     async def process(self):
         response = await self.client.send(
@@ -37,13 +90,16 @@ class ChannelHistoryReadTask(AsyncTask):
 
             users = {i.id: i for i in response.users}
             chats = {i.id: i for i in response.chats}
-            http = aiohttp.ClientSession()
 
             for message in response.new_messages:
                 message = await MessagePyrogram._parse(self.client, message, users, chats)
-                await http.post(self.webhook, data=bytes(str(message), "utf8"))
+                message = {"update_id": 1, "message": message}
 
-            await http.close()
+                data = json.dumps(message, default=JsonSerializer.default, ensure_ascii=True)
+                response = await self.http.post(self.webhook, data=bytes(data, "utf8"))
+
+                await response.read()
+                response.close()
 
             if not response.final:
                 return 1