Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-01-09 14:39:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

client: Store media info when decrypting instead of using a event callback.

Browse Source 
Event callbacks are only called for events that come through a sync
resposne. Since events in the scrollback might be decryptable there's no
reason to not store the media info for those as well.
This commit is contained in:
Damir Jelić 2020-07-20 15:12:25 +02:00
parent 2c0bd21e8c
commit 01e0c9363e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pantalaimon/client.py
View File

@ -208,7 +208,6 @@ class PanClient(AsyncClient):
self.key_request_cb, (RoomKeyRequest, RoomKeyRequestCancellation) self.key_request_cb, (RoomKeyRequest, RoomKeyRequestCancellation)
) )
self.add_event_callback(self.undecrypted_event_cb, MegolmEvent) self.add_event_callback(self.undecrypted_event_cb, MegolmEvent)
self.add_event_callback(self.store_media_cb, RoomEncryptedMedia)
self.add_event_callback( self.add_event_callback(
self.store_thumbnail_cb, self.store_thumbnail_cb,
(RoomEncryptedImage, RoomEncryptedVideo, RoomEncryptedFile), (RoomEncryptedImage, RoomEncryptedVideo, RoomEncryptedFile),
@ -270,7 +269,7 @@ class PanClient(AsyncClient):
self.media_info[(mxc_server, mxc_path)] = media self.media_info[(mxc_server, mxc_path)] = media
self.pan_store.save_media(self.server_name, media) self.pan_store.save_media(self.server_name, media)
def store_media_cb(self, room, event): def store_event_media(self, event):
try: try:
mxc = urlparse(event.url) mxc = urlparse(event.url)
except ValueError: except ValueError:
@ -828,6 +827,8 @@ class PanClient(AsyncClient):
) )
if isinstance(decrypted_event, RoomEncryptedMedia): if isinstance(decrypted_event, RoomEncryptedMedia):
self.store_event_media(decrypted_event)
decrypted_event.source["content"]["url"] = decrypted_event.url decrypted_event.source["content"]["url"] = decrypted_event.url
if decrypted_event.thumbnail_url: if decrypted_event.thumbnail_url: