Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream

app/javascript/mastodon/features/explore/components/author_link.jsx

@@ -1,23 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { Avatar } from 'mastodon/components/avatar';
-import { useAppSelector } from 'mastodon/store';
-import { LinkedDisplayName } from '@/mastodon/components/display_name';
-
-export const AuthorLink = ({ accountId }) => {
-  const account = useAppSelector(state => state.getIn(['accounts', accountId]));
-
-  if (!account) {
-    return null;
-  }
-
-  return (
-    <LinkedDisplayName displayProps={{account}} className='story__details__shared__author-link'>
-      <Avatar account={account} size={16} />
-    </LinkedDisplayName>
-  );
-};
-
-AuthorLink.propTypes = {
-  accountId: PropTypes.string.isRequired,
-};

app/javascript/mastodon/features/explore/components/author_link.tsx

@@ -0,0 +1,22 @@
+import type { FC } from 'react';
+
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
+import { Avatar } from 'mastodon/components/avatar';
+import { useAppSelector } from 'mastodon/store';
+
+export const AuthorLink: FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  if (!account) {
+    return null;
+  }
+
+  return (
+    <LinkedDisplayName
+      displayProps={{ account, variant: 'simple' }}
+      className='story__details__shared__author-link'
+    >
+      <Avatar account={account} size={16} />
+    </LinkedDisplayName>
+  );
+};

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

@@ -48,9 +48,8 @@ export const EmbeddedStatusContent: React.FC<{
   );
   const htmlHandlers = useElementHandledLink({
     hashtagAccountId: status.get('account') as string | undefined,
-    hrefToMentionAccountId(href) {
-      const mention = mentions.find((item) => item.url === href);
-      return mention?.id;
+    hrefToMention(href) {
+      return mentions.find((item) => item.url === href);
     },
   });