Merge remote-tracking branch 'origin/develop' into setttingssync

src/services/entity_normalizer/entity_normalizer.service.js

@@ -1,5 +1,6 @@
 import { parseLinkHeader } from '@web3-storage/parse-link-header'
 import escapeHtml from 'escape-html'
+import fileTypeService from '../file_type/file_type.service.js'
 import punycode from 'punycode.js'
 
 import { isStatusNotification } from '../notification_utils/notification_utils.js'
@@ -297,6 +298,11 @@ export const parseAttachment = (data) => {
     // output.meta = ??? missing
   }
 
+  if (data.type !== 'unknown') {
+    output.type = data.type
+  } else {
+    output.type = fileTypeService.fileType(output.mimetype)
+  }
   output.url = data.url
   output.large_thumb_url = data.preview_url
   output.description = data.description

src/services/html_converter/utility.service.js

@@ -23,7 +23,7 @@ export const getAttrs = (tag, filter) => {
     .replace(/\/?$/, '')
     .trim()
   const attrs = Array.from(
-    innertag.matchAll(/([a-z]+[a-z0-9-]*)(?:=("[^"]+?"|'[^']+?'))?/gi),
+    innertag.matchAll(/([a-z]+[a-z0-9-]*)(?:=((?:"(?:\\.|[^"\\])*")|(?:'(?:\\.|[^'\\])*')))?/gi),
   )
     .map(([, key, value]) => [key, value])
     .map(([k, v]) => {