Log better errors when unable to show attachments

Co-authored-by: Josh Perez <60019601+josh-signal@users.noreply.github.com>
signalapp · Apr 29, 2022 · 8dd2a1a · 8dd2a1a
1 parent f235d48
commit 8dd2a1a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/ts/test-both/types/errors_test.ts b/ts/test-both/types/errors_test.ts
@@ -29,7 +29,7 @@ describe('Errors', () => {
       assert.isUndefined(error.stack);
 
       const formattedError = Errors.toLogFormat(error);
-      assert.strictEqual(formattedError, 'Error: boom');
+      assert.strictEqual(formattedError, 'boom');
     });
 
     [0, false, null, undefined].forEach(value => {

diff --git a/ts/types/errors.ts b/ts/types/errors.ts
@@ -3,11 +3,17 @@
 
 /* eslint-disable max-classes-per-file */
 
+import { get, has } from 'lodash';
+
 export function toLogFormat(error: unknown): string {
   if (error instanceof Error && error.stack) {
     return error.stack;
   }
 
+  if (has(error, 'message')) {
+    return get(error, 'message');
+  }
+
   return String(error);
 }
 

diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
@@ -2138,6 +2138,21 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
           getAbsoluteAttachmentPath(item.thumbnail?.path ?? ''),
       }));
 
+    if (!media.length) {
+      log.error(
+        'showLightbox: unable to load attachment',
+        attachments.map(x => ({
+          contentType: x.contentType,
+          error: x.error,
+          flags: x.flags,
+          path: x.path,
+          size: x.size,
+        }))
+      );
+      showToast(ToastUnableToLoadAttachment);
+      return;
+    }
+
     const selectedMedia =
       media.find(item => attachment.path === item.path) || media[0];