matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reuse RoomMessageText class for our own messages.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-02-26 22:34:14 +01:00
parent 01ad6e9d9a
commit 4f848da7fe
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
matrix/events.py
View file

@ -24,8 +24,8 @@ from operator import itemgetter
from matrix.globals import W from matrix.globals import W
from matrix.utils import (color_for_tags, tags_for_message, sanitize_id, from matrix.utils import (color_for_tags, tags_for_message, sanitize_id,
sanitize_token, sanitize_text, tags_from_line_data) sanitize_token, sanitize_text, tags_from_line_data)
from matrix.rooms import (matrix_create_room_buffer, RoomInfo, RoomMessageEvent, from matrix.rooms import (matrix_create_room_buffer, RoomInfo, RoomMessageText,
RoomRedactedMessageEvent) RoomMessageEvent, RoomRedactedMessageEvent)
class MatrixEvent(): class MatrixEvent():
@ -92,37 +92,34 @@ class MatrixLoginEvent(MatrixEvent):
class MatrixSendEvent(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.room_id = room_id
self.event_id = event_id
self.message = message self.message = message
MatrixEvent.__init__(self, server) MatrixEvent.__init__(self, server)
def execute(self): def execute(self):
room_id = self.room_id tags = [
author = self.server.user "matrix_message", "notify_none", "no_highlight", "self_msg", "log1"
event_id = self.event_id ]
weechat_message = self.message.to_weechat()
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}," self.message.execute(self.server, room, buff, tags)
"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)
@classmethod @classmethod
def from_dict(cls, server, room_id, message, parsed_dict): def from_dict(cls, server, room_id, message, parsed_dict):
try: try:
return cls(server, room_id, sanitize_id(parsed_dict["event_id"]), event_id = sanitize_id(parsed_dict["event_id"])
message) 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): except (KeyError, TypeError, ValueError):
return MatrixErrorEvent.from_dict(server, "Error sending message", return MatrixErrorEvent.from_dict(server, "Error sending message",
False, parsed_dict) False, parsed_dict)