From ff2bd1b7b476052752e16363b90c270bf5166a3c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Nov 2020 11:57:51 +1100 Subject: [PATCH] allow preview without image to be send otherwise, an error during the send was triggered --- js/modules/loki_app_dot_net_api.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index f90504ca7..ada944a49 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -1511,7 +1511,7 @@ class LokiPublicChannelAPI { } } sigString += [...attachmentAnnotations, ...previewAnnotations] - .map(data => data.id || data.image.id) + .map(data => data.id || (data.image && data.image.id)) .sort() .join(''); sigString += sigVer; @@ -2038,18 +2038,18 @@ class LokiPublicChannelAPI { // Signal stuff we actually care about linkPreviewTitle: preview.title, linkPreviewUrl: preview.url, - caption: preview.image.caption, - contentType: preview.image.contentType, - digest: preview.image.digest, - fileName: preview.image.fileName, - flags: preview.image.flags, - height: preview.image.height, - id: preview.image.id, - key: preview.image.key, - size: preview.image.size, - thumbnail: preview.image.thumbnail, - url: preview.image.url, - width: preview.image.width, + caption: (preview.image && preview.image.caption) || undefined, + contentType: (preview.image && preview.image.contentType) || undefined, + digest: (preview.image && preview.image.digest) || undefined, + fileName: (preview.image && preview.image.fileName) || undefined, + flags: (preview.image && preview.image.flags) || undefined, + height: (preview.image && preview.image.height) || undefined, + id: (preview.image && preview.image.id) || undefined, + key: (preview.image && preview.image.key) || undefined, + size: (preview.image && preview.image.size) || undefined, + thumbnail: (preview.image && preview.image.thumbnail) || undefined, + url: (preview.image && preview.image.url) || undefined, + width: (preview.image && preview.image.width) || undefined, }, }; return annotation;