Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-02-25 17:11:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

client: Don't check for the room id until we know it's a valid event.

Browse Source
This commit is contained in:
Damir Jelić 2019-04-28 21:16:14 +02:00
parent 0a1008a127
commit 3e67010278
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pantalaimon/client.py
View File

@ -164,14 +164,14 @@ class PanClient(AsyncClient):
# type: (Dict[Any, Any], Optional[str]) -> () # type: (Dict[Any, Any], Optional[str]) -> ()
event = RoomEncryptedEvent.parse_event(event_dict) event = RoomEncryptedEvent.parse_event(event_dict)
if not event.room_id:
event.room_id = room_id
if not isinstance(event, MegolmEvent): if not isinstance(event, MegolmEvent):
logger.warn("Encrypted event is not a megolm event:" logger.warn("Encrypted event is not a megolm event:"
"\n{}".format(pformat(event_dict))) "\n{}".format(pformat(event_dict)))
return None return None
if not event.room_id:
event.room_id = room_id
try: try:
decrypted_event = self.decrypt_event(event) decrypted_event = self.decrypt_event(event)
logger.info("Decrypted event: {}".format(decrypted_event)) logger.info("Decrypted event: {}".format(decrypted_event))