component AP gateway: handle attachments

This commit is contained in:
Goffi 2023-03-23 15:42:21 +01:00
commit c3f97ec712
2 changed files with 168 additions and 97 deletions

View file

@ -132,11 +132,6 @@ class Const(object):
MESS_KEY_ENCRYPTED = "encrypted"
MESS_KEY_TRUSTED = "trusted"
MESS_KEY_ATTACHMENTS = "attachments"
MESS_KEY_ATTACHMENTS_MEDIA_TYPE = "media_type"
MESS_KEY_ATTACHMENTS_PREVIEW = "preview"
MESS_KEY_ATTACHMENTS_RESIZE = "resize"
# File encryption algorithms
ENC_AES_GCM = "AES-GCM"
@ -368,6 +363,11 @@ class Const(object):
## Common data keys ##
KEY_THUMBNAILS = "thumbnails"
KEY_PROGRESS_ID = "progress_id"
KEY_ATTACHMENTS = "attachments"
KEY_ATTACHMENTS_MEDIA_TYPE = "media_type"
KEY_ATTACHMENTS_PREVIEW = "preview"
KEY_ATTACHMENTS_RESIZE = "resize"
## Common extra keys/values ##
KEY_ORDER_BY = "order_by"

View file

@ -821,7 +821,7 @@ class SatXMPPEntity(core_types.SatXMPPEntity):
"""Return True if a message contain payload to show in frontends"""
return (
mess_data["message"] or mess_data["subject"]
or mess_data["extra"].get(C.MESS_KEY_ATTACHMENTS)
or mess_data["extra"].get(C.KEY_ATTACHMENTS)
or mess_data["type"] == C.MESS_TYPE_INFO
)
@ -1361,16 +1361,16 @@ class SatMessageProtocol(xmppim.MessageProtocol):
def completeAttachments(self, data):
"""Complete missing metadata of attachments"""
for attachment in data['extra'].get(C.MESS_KEY_ATTACHMENTS, []):
for attachment in data['extra'].get(C.KEY_ATTACHMENTS, []):
if "name" not in attachment and "url" in attachment:
name = (Path(unquote(urlparse(attachment['url']).path)).name
or C.FILE_DEFAULT_NAME)
attachment["name"] = name
if ((C.MESS_KEY_ATTACHMENTS_MEDIA_TYPE not in attachment
if ((C.KEY_ATTACHMENTS_MEDIA_TYPE not in attachment
and "name" in attachment)):
media_type = mimetypes.guess_type(attachment['name'], strict=False)[0]
if media_type:
attachment[C.MESS_KEY_ATTACHMENTS_MEDIA_TYPE] = media_type
attachment[C.KEY_ATTACHMENTS_MEDIA_TYPE] = media_type
return data