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

Abstract away unknown messages and emote messages.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-02-26 19:35:40 +01:00
parent 2b428ac132
commit 6db44525dc
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
matrix/rooms.py
View file

@ -278,11 +278,11 @@ class RoomMessageEvent(RoomEvent):
W.prnt_date_tags(buff, date, tags_string, data) W.prnt_date_tags(buff, date, tags_string, data)
class RoomMessageUnknown(RoomMessageEvent): class RoomMessageSimple(RoomMessageEvent):
def __init__(self, event_id, sender, age, message_type, body): def __init__(self, event_id, sender, age, message, message_type):
self.message = message
self.message_type = message_type self.message_type = message_type
self.body = body
RoomEvent.__init__(self, event_id, sender, age) RoomEvent.__init__(self, event_id, sender, age)
@classmethod @classmethod
@ -291,14 +291,17 @@ class RoomMessageUnknown(RoomMessageEvent):
sender = sanitize_id(event["sender"]) sender = sanitize_id(event["sender"])
age = sanitize_age(event["unsigned"]["age"]) age = sanitize_age(event["unsigned"]["age"])
body = sanitize_text(event["content"]["body"]) message = sanitize_text(event["content"]["body"])
message_type = sanitize_text(event["content"]["msgtype"]) message_type = sanitize_text(event["content"]["msgtype"])
return cls(event_id, sender, age, message_type, body) return cls(event_id, sender, age, message, message_type)
class RoomMessageUnknown(RoomMessageSimple):
def execute(self, server, room, buff, tags): def execute(self, server, room, buff, tags):
msg = ("Unknown message of type {t}, body: {body}").format( msg = ("Unknown message of type {t}, body: {body}").format(
t=self.message_type, body=self.body) t=self.message_type, body=self.message)
self._print_message(msg, room, buff, tags) self._print_message(msg, room, buff, tags)
@ -336,11 +339,7 @@ class RoomMessageText(RoomMessageEvent):
self._print_message(msg, room, buff, tags) self._print_message(msg, room, buff, tags)
class RoomMessageEmote(RoomMessageEvent): class RoomMessageEmote(RoomMessageSimple):
def __init__(self, event_id, sender, age, message):
self.message = message
RoomEvent.__init__(self, event_id, sender, age)
def execute(self, server, room, buff, tags): def execute(self, server, room, buff, tags):
nick, color_name = sender_to_nick_and_color(room, self.sender) nick, color_name = sender_to_nick_and_color(room, self.sender)
@ -361,15 +360,6 @@ class RoomMessageEmote(RoomMessageEvent):
date = date_from_age(self.age) date = date_from_age(self.age)
W.prnt_date_tags(buff, date, tags_string, data) W.prnt_date_tags(buff, date, tags_string, data)
@classmethod
def from_dict(cls, event):
event_id = sanitize_id(event["event_id"])
sender = sanitize_id(event["sender"])
age = sanitize_age(event["unsigned"]["age"])
msg = sanitize_text(event["content"]["body"])
return cls(event_id, sender, age, msg)
class RoomMessageMedia(RoomMessageEvent): class RoomMessageMedia(RoomMessageEvent):