Fix potential type bug + editorconfig.

vircadia · Sep 12, 2024 · 8d7336b · 8d7336b
1 parent 9b946ac
commit 8d7336b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,7 +6,7 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
-end_of_line = crlf
+end_of_line = lf
 insert_final_newline = true
 
 [*.md]

diff --git a/src/hooks/media/add-uri-to-file.ts b/src/hooks/media/add-uri-to-file.ts
@@ -44,7 +44,15 @@ export default (): Hook => {
                     }.${fileExtenstion}`;
                 }
             } else {
-                context.data.id = uploadPath && id? path.join(uploadPath, id): uploadPath? path.join(uploadPath,context.params.file.originalname): context.params.file.originalname;
+                context.data.id =
+                    uploadPath && typeof uploadPath === 'string' && id
+                        ? path.join(uploadPath, id)
+                        : uploadPath && typeof uploadPath === 'string'
+                            ? path.join(
+                                uploadPath,
+                                context.params.file.originalname || ''
+                            )
+                            : context.params.file.originalname || '';
             }
         }
         return context;