From 053cc9d7eee5d46429f7bd7268a1942c357bb1da Mon Sep 17 00:00:00 2001
From: git-bruh <e817509a-8ee9-4332-b0ad-3a6bdf9ab63f@aleeas.com>
Date: Mon, 30 Nov 2020 12:12:05 +0530
Subject: [PATCH] Edit discord messages instead of sending new ones

---
 main.py | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index a1ebb1e..3235000 100644
--- a/main.py
+++ b/main.py
@@ -66,10 +66,7 @@ async def on_message_edit(before, after):
 
     content = await process_discord(after)
 
-    await message_redact(message_cache[before.id], "Message edited")
-
-    matrix_message = await message_send(f"{content[0]} (edited)")
-    message_cache[after.id] = matrix_message
+    await message_send(content[0], edit_id=message_cache[before.id])
 
 
 @discord_client.event
@@ -191,7 +188,7 @@ async def create_matrix_client():
     await matrix_client.close()
 
 
-async def message_send(message, reply_id=None):
+async def message_send(message, reply_id=None, edit_id=None):
     content = {
         "msgtype": "m.text",
         "body": message,
@@ -202,6 +199,19 @@ async def message_send(message, reply_id=None):
             "m.in_reply_to": {"event_id": reply_id},
         }
 
+    if edit_id:
+        content["body"] = f" * {message}"
+
+        content["m.new_content"] = {
+                "body": message,
+                "msgtype": "m.text"
+        }
+
+        content["m.relates_to"] = {
+                "event_id": edit_id,
+                "rel_type": "m.replace",
+        }
+
     message = await matrix_client.room_send(
         room_id=config["room_id"],
         message_type="m.room.message",
@@ -224,6 +234,18 @@ async def message_callback(room, event):
     if room.room_id != config["room_id"]:
         return
 
+    # https://github.com/Rapptz/discord.py/issues/6058
+    # content_dict = event.source.get("content")
+    # try:
+    #     if content_dict["m.relates_to"]["rel_type"] == "m.replace":
+    #         edited_event = content_dict["m.relates_to"]["event_id"]
+    #         edited_content = content_dict["m.new_content"]["body"]
+    #         webhook_message = message_cache[edited_event]
+    #         await something_to_edit_webhook(webhook_message, edited_content)
+    #         return
+    # except KeyError:
+    #     pass
+
     message = event.body
 
     if not message: