From 4f848da7fe37446670e128a7166a3932113de318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?poljar=20=28Damir=20Jeli=C4=87=29?= <poljar@termina.org.uk>
Date: Mon, 26 Feb 2018 22:34:14 +0100
Subject: [PATCH] Reuse RoomMessageText class for our own messages.

---
 matrix/events.py | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/matrix/events.py b/matrix/events.py
index 42a931f..70e6032 100644
--- a/matrix/events.py
+++ b/matrix/events.py
@@ -24,8 +24,8 @@ from operator import itemgetter
 from matrix.globals import W
 from matrix.utils import (color_for_tags, tags_for_message, sanitize_id,
                           sanitize_token, sanitize_text, tags_from_line_data)
-from matrix.rooms import (matrix_create_room_buffer, RoomInfo, RoomMessageEvent,
-                          RoomRedactedMessageEvent)
+from matrix.rooms import (matrix_create_room_buffer, RoomInfo, RoomMessageText,
+                          RoomMessageEvent, RoomRedactedMessageEvent)
 
 
 class MatrixEvent():
@@ -92,37 +92,34 @@ class MatrixLoginEvent(MatrixEvent):
 
 class MatrixSendEvent(MatrixEvent):
 
-    def __init__(self, server, room_id, event_id, message):
+    def __init__(self, server, room_id, message):
         self.room_id = room_id
-        self.event_id = event_id
         self.message = message
         MatrixEvent.__init__(self, server)
 
     def execute(self):
-        room_id = self.room_id
-        author = self.server.user
-        event_id = self.event_id
-        weechat_message = self.message.to_weechat()
+        tags = [
+            "matrix_message", "notify_none", "no_highlight", "self_msg", "log1"
+        ]
 
-        date = int(time.time())
+        buff = self.server.buffers[self.room_id]
+        room = self.server.rooms[self.room_id]
 
-        tag = ("notify_none,no_highlight,self_msg,log1,nick_{a},"
-               "prefix_nick_{color},matrix_id_{event_id},"
-               "matrix_message").format(
-                   a=author,
-                   color=color_for_tags("weechat.color.chat_nick_self"),
-                   event_id=event_id)
-
-        message = "{author}\t{msg}".format(author=author, msg=weechat_message)
-
-        buf = self.server.buffers[room_id]
-        W.prnt_date_tags(buf, date, tag, message)
+        self.message.execute(self.server, room, buff, tags)
 
     @classmethod
     def from_dict(cls, server, room_id, message, parsed_dict):
         try:
-            return cls(server, room_id, sanitize_id(parsed_dict["event_id"]),
-                       message)
+            event_id = sanitize_id(parsed_dict["event_id"])
+            sender = server.user_id
+            age = 0
+            plain_message = message.to_plain()
+            formatted_message = message
+
+            message = RoomMessageText(event_id, sender, age, plain_message,
+                                      formatted_message)
+
+            return cls(server, room_id, message)
         except (KeyError, TypeError, ValueError):
             return MatrixErrorEvent.from_dict(server, "Error sending message",
                                               False, parsed_dict)