Merge commit '6d2493ca7c39a5d60edd7109de0c24256f8fff8c' into glitch-soc/merge-upstream

app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx

@@ -64,7 +64,7 @@ export const EmbeddedStatusContent: React.FC<{
           link.setAttribute('title', `@${mention.get('acct')}`);
           link.setAttribute('href', `/@${mention.get('acct')}`);
         } else if (
-          link.textContent?.[0] === '#' ||
+          link.textContent.startsWith('#') ||
           link.previousSibling?.textContent?.endsWith('#')
         ) {
           link.addEventListener(

app/javascript/mastodon/features/onboarding/profile.tsx

@@ -54,9 +54,7 @@ export const Profile: React.FC<{
     me ? state.accounts.get(me) : undefined,
   );
   const [displayName, setDisplayName] = useState(account?.display_name ?? '');
-  const [note, setNote] = useState(
-    account ? (unescapeHTML(account.note) ?? '') : '',
-  );
+  const [note, setNote] = useState(account ? unescapeHTML(account.note) : '');
   const [avatar, setAvatar] = useState<File>();
   const [header, setHeader] = useState<File>();
   const [discoverable, setDiscoverable] = useState(

app/javascript/mastodon/features/ui/components/embed_modal.tsx

@@ -36,6 +36,7 @@ const EmbedModal: React.FC<{
         }
 
         iframeDocument.open();
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
         iframeDocument.write(data.html);
         iframeDocument.close();