Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream

app/javascript/mastodon/features/emoji/mode.ts

@@ -76,7 +76,7 @@ function testEmojiSupport(text: string) {
   return compareFeatures(feature1, feature2);
 }
 
-const EMOJI_VERSION_TEST_EMOJI = '🫨'; // shaking head, from v15
+const EMOJI_VERSION_TEST_EMOJI = '🫩'; // face with bags under eyes, from Unicode 16.0.
 const EMOJI_FLAG_TEST_EMOJI = '🇨🇭';
 
 export function determineEmojiMode(style: string): EmojiMode {

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

@@ -46,11 +46,15 @@ export const EmbeddedStatusContent: React.FC<{
     () => (status.get('mentions') as List<Mention>).toJS(),
     [status],
   );
-  const htmlHandlers = useElementHandledLink({
-    hashtagAccountId: status.get('account') as string | undefined,
-    hrefToMention(href) {
+  const hrefToMention = useCallback(
+    (href: string) => {
       return mentions.find((item) => item.url === href);
     },
+    [mentions],
+  );
+  const htmlHandlers = useElementHandledLink({
+    hashtagAccountId: status.get('account') as string | undefined,
+    hrefToMention,
   });
 
   const handleContentRef = useCallback(

app/javascript/mastodon/features/status/components/action_bar.jsx

@@ -229,6 +229,10 @@ class ActionBar extends PureComponent {
       menu.push({ text: intl.formatMessage(messages.share), action: this.handleShare });
     }
 
+    if (publicStatus && (signedIn || !isRemote)) {
+      menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
+    }
+
     if (quickBoosting && signedIn) {
       const quoteItem = quoteItemState(statusQuoteState);
       menu.push(null);
@@ -240,11 +244,6 @@ class ActionBar extends PureComponent {
         disabled: quoteItem.disabled,
         action: this.handleQuoteClick,
       });
-      menu.push(null);
-    }
-
-    if (publicStatus && (signedIn || !isRemote)) {
-      menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
     }
 
     if (signedIn) {