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

rooms: Encrypted events can be redacted as well.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-06-18 20:41:46 +02:00
parent 90a9e607b1
commit e6e996997f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
matrix/rooms.py
View file

@ -250,7 +250,9 @@ class RoomInfo():
state_event = None state_event = None
message_event = None message_event = None
if event_dict["type"] == "m.room.message": if "redacted_by" in event_dict["unsigned"]:
message_event = RoomRedactedMessageEvent.from_dict(event_dict)
elif event_dict["type"] == "m.room.message":
message_event = RoomInfo._message_from_event(event_dict) message_event = RoomInfo._message_from_event(event_dict)
elif event_dict["type"] == "m.room.member": elif event_dict["type"] == "m.room.member":
state_event, message_event = ( state_event, message_event = (
@ -309,10 +311,11 @@ class RoomInfo():
message_events.append(s_event) message_events.append(s_event)
except (ValueError, TypeError, KeyError) as error: except (ValueError, TypeError, KeyError) as error:
message = ("{prefix}matrix: Error parsing " message = ("{prefix}matrix: Error parsing "
"room event of type {type}: {error}").format( "room event of type {type}: {error}\n{event}").format(
prefix=W.prefix("error"), prefix=W.prefix("error"),
type=event["type"], type=event["type"],
error=pformat(error)) error=pformat(error),
event=pformat(event))
W.prnt("", message) W.prnt("", message)
raise raise