Merge branch 'main' into temp3_for-taruntarun

# Conflicts:
#	config/locales/simple_form.it.yml
#	config/locales/simple_form.nl.yml
#	config/locales/simple_form.nn.yml
#	config/locales/simple_form.sq.yml

Author: mayaeh

Gemfile.lock

@@ -603,7 +603,7 @@ GEM
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
     prettyprint (0.2.0)
-    prism (1.5.1)
+    prism (1.5.2)
     prometheus_exporter (2.3.0)
       webrick
     propshaft (1.3.1)
@@ -614,7 +614,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (7.0.4)
+    puma (7.1.0)
       nio4r (~> 2.0)
     pundit (2.5.2)
       activesupport (>= 3.0.0)
@@ -766,10 +766,10 @@ GEM
     rubocop-i18n (3.2.3)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-performance (1.26.0)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rails (2.33.4)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)

app/javascript/mastodon/components/status_action_bar/index.jsx

@@ -278,7 +278,11 @@ class StatusActionBar extends ImmutablePureComponent {
     if (publicStatus && 'share' in navigator) {
       menu.push({ text: intl.formatMessage(messages.share), action: this.handleShareClick });
     }
-    
+
+    if (publicStatus && !isRemote) {
+      menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
+    }
+
     if (quickBoosting && signedIn) {
       const quoteItem = quoteItemState(statusQuoteState);
       menu.push(null);
@@ -290,11 +294,6 @@ class StatusActionBar extends ImmutablePureComponent {
         disabled: quoteItem.disabled,
         action: this.handleQuoteClick,
       });
-      menu.push(null);
-    }
-
-    if (publicStatus && !isRemote) {
-      menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
     }
 
     if (signedIn) {

app/javascript/mastodon/components/status_content.jsx

@@ -269,7 +269,7 @@ class StatusContent extends PureComponent {
               lang={language}
               htmlString={content}
               extraEmojis={status.get('emojis')}
-              onElement={this.handleElement.bind(this)}
+              onElement={this.handleElement}
             />
 
             {poll}
@@ -287,7 +287,7 @@ class StatusContent extends PureComponent {
             lang={language}
             htmlString={content}
             extraEmojis={status.get('emojis')}
-            onElement={this.handleElement.bind(this)}
+            onElement={this.handleElement}
           />
 
           {poll}

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

@@ -230,6 +230,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);
@@ -241,11 +245,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) {

app/javascript/mastodon/locales/es-MX.json

@@ -753,7 +753,7 @@
   "privacy.unlisted.short": "Pública, pero discreta",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
-  "quote_error.edit": "No se pueden añadir citas mientras se edita una publicación.",
+  "quote_error.edit": "No se pueden añadir citas cuando se edita una publicación.",
   "quote_error.poll": "No se permite citar encuestas.",
   "quote_error.quote": "Solo se permite una cita a la vez.",
   "quote_error.unauthorized": "No estás autorizado a citar esta publicación.",

app/javascript/mastodon/locales/es.json

@@ -753,7 +753,7 @@
   "privacy.unlisted.short": "Pública silenciosa",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
-  "quote_error.edit": "No se pueden añadir citas mientras se edita una publicación.",
+  "quote_error.edit": "No se pueden añadir citas cuando se edita una publicación.",
   "quote_error.poll": "No es posible citar encuestas.",
   "quote_error.quote": "Solo se permite una cita a la vez.",
   "quote_error.unauthorized": "No tienes permiso para citar esta publicación.",

app/javascript/mastodon/locales/et.json

@@ -876,6 +876,7 @@
   "status.contains_quote": "Sisaldab tsitaati",
   "status.context.loading": "Laadin veel vastuseid",
   "status.context.loading_error": "Uute vastuste laadimine ei õnnestunud",
+  "status.context.loading_success": "Uued vastused on laaditud",
   "status.context.more_replies_found": "Leidub veel vastuseid",
   "status.context.retry": "Proovi uuesti",
   "status.context.show": "Näita",

app/javascript/mastodon/locales/ia.json

@@ -257,7 +257,12 @@
   "confirmations.revoke_quote.confirm": "Remover message",
   "confirmations.revoke_quote.message": "Iste action non pote esser disfacite.",
   "confirmations.revoke_quote.title": "Remover message?",
+  "confirmations.unblock.confirm": "Disblocar",
+  "confirmations.unblock.title": "Disblocar {name}?",
   "confirmations.unfollow.confirm": "Non plus sequer",
+  "confirmations.unfollow.title": "Cessar de sequer {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar requesta",
+  "confirmations.withdraw_request.title": "Retirar le requesta de sequer {name}?",
   "content_warning.hide": "Celar le message",
   "content_warning.show": "Monstrar in omne caso",
   "content_warning.show_more": "Monstrar plus",
@@ -748,6 +753,7 @@
   "privacy.unlisted.short": "Public, non listate",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
+  "quote_error.edit": "Non es possibile adder citationes quando se modifica un message.",
   "quote_error.poll": "Non es permittite citar sondages.",
   "quote_error.quote": "Solmente un citation al vice es permittite.",
   "quote_error.unauthorized": "Tu non es autorisate a citar iste message.",
@@ -870,6 +876,7 @@
   "status.contains_quote": "Contine un citation",
   "status.context.loading": "Cargante plus responsas",
   "status.context.loading_error": "Non poteva cargar nove responsas",
+  "status.context.loading_success": "Nove responsas cargate",
   "status.context.more_replies_found": "Plus responsas trovate",
   "status.context.retry": "Tentar de novo",
   "status.context.show": "Monstrar",
@@ -916,6 +923,8 @@
   "status.quote_private": "Le messages private non pote esser citate",
   "status.quotes": "{count, plural, one {citation} other {citationes}}",
   "status.quotes.empty": "Necuno ha ancora citate iste message. Quando alcuno lo face, illo apparera hic.",
+  "status.quotes.local_other_disclaimer": "Le citationes rejectate per le autor non essera monstrate.",
+  "status.quotes.remote_other_disclaimer": "Solmente le citationes de {domain} se garanti de esser monstrate hic. Citationes rejectate per le autor non essera monstrate.",
   "status.read_more": "Leger plus",
   "status.reblog": "Impulsar",
   "status.reblog_or_quote": "Impulsar o citar",