Merge branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma

src/components/poll/poll_form.js

@@ -103,9 +103,9 @@ export default {
     convertExpiryFromUnit (unit, amount) {
       // Note: we want seconds and not milliseconds
       switch (unit) {
-        case 'minutes': return 0.001 * amount * DateUtils.MINUTE
-        case 'hours': return 0.001 * amount * DateUtils.HOUR
-        case 'days': return 0.001 * amount * DateUtils.DAY
+        case 'minutes': return amount * DateUtils.MINUTE / 1000
+        case 'hours': return amount * DateUtils.HOUR / 1000
+        case 'days': return amount * DateUtils.DAY / 1000
       }
     },
     expiryAmountChange () {

src/components/rich_content/rich_content.jsx

@@ -188,7 +188,7 @@ export default {
               break
             }
           case 'span':
-            if (this.handleLinks && attrs['class'] && attrs['class'].includes('h-card')) {
+            if (this.handleLinks && attrs?.['class']?.includes?.('h-card')) {
               return ['', children.map(processItem), '']
             }
         }