Merge branch 'kb_development' into upstream-20240906

app/javascript/mastodon/actions/notifications.js

@@ -81,24 +81,21 @@ export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUE
 export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS';
 export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL';
 
-const DEFAULT_NOTIFICATION_MESSAGES = {
+const messages = defineMessages({
-  'notification.admin.report': '{name} reported {target}',
+  // mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
-  'notification.admin.sign_up': '{name} signed up',
-  'notification.emoji_reaction': '{name} reacted your post with emoji',
-  'notification.favourite': '{name} favorited your post',
-  'notification.follow': '{name} followed you',
-  'notification.list_status': '{name} post is added to {listName}',
-  'notification.mention': 'Mention',
-  'notification.poll': 'A poll you voted in has ended',
-  'notification.reblog': '{name} boosted your post',
-  'notification.status': '{name} just posted',
-  'notification.status_reference': '{name} quoted your post',
-  'notification.update': '{name} edited a post',
-};
-
-defineMessages({
-  mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
   group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
+  'message_admin.report': { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
+  'message_admin.sign_up': { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
+  message_emoji_reaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your post with emoji' },
+  message_favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your post' },
+  message_follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
+  message_list_status: { id: 'notification.list_status', defaultMessage: '{name} post is added to {listName}' },
+  message_mention: { id: 'notification.mention', defaultMessage: 'Mention' },
+  message_poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
+  message_reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' },
+  message_status: { id: 'notification.status', defaultMessage: '{name} just posted' },
+  message_status_reference: { id: 'notification.status_reference', defaultMessage: '{name} quoted your post' },
+  message_update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
 });
 
 const fetchRelatedRelationships = (dispatch, notifications) => {
@@ -176,7 +173,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
 
     // Desktop notifications
     if (typeof window.Notification !== 'undefined' && showAlert && !filtered) {
-      const messageTemplate = intlMessages[`notification.${notification.type}`] || DEFAULT_NOTIFICATION_MESSAGES[`notification.${notification.type}`];
+      const messageTemplate = intlMessages[`notification.${notification.type}`] || messages[`message_${notification.type}`] || '[NO MESSAGE DEFINITION]';
       const title = new IntlMessageFormat(messageTemplate, intlLocale).format({
         name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username,
         listName: notification.list && notification.list.title,

app/javascript/mastodon/features/notifications/components/notification.jsx

@@ -35,7 +35,7 @@ import Report from './report';
 
 const messages = defineMessages({
   favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your post' },
-  emojiReaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your status with emoji' },
+  emojiReaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your post with emoji' },
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
   ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
   poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
@@ -241,7 +241,7 @@ class Notification extends ImmutablePureComponent {
             </div>
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.emoji_reaction' defaultMessage='{name} reacted your status with emoji' values={{ name: link }} />
+              <FormattedMessage id='notification.emoji_reaction' defaultMessage='{name} reacted your post with emoji' values={{ name: link }} />
             </span>
           </div>
 

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

@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.emoji_reaction'
-        defaultMessage='{name} reacted your status with emoji'
+        defaultMessage='{name} reacted your post with emoji'
         values={{ name: displayedName }}
       />
     );

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

@@ -25,6 +25,7 @@ import { DisplayName } from '../../../components/display_name';
 import MediaGallery from '../../../components/media_gallery';
 import StatusContent from '../../../components/status_content';
 import StatusEmojiReactionsBar from '../../../components/status_emoji_reactions_bar';
+import CompactedStatusContainer from '../../../containers/compacted_status_container';
 import Audio from '../../audio';
 import scheduleIdleTask from '../../ui/util/schedule_idle_task';
 import Video from '../../video';
@@ -323,6 +324,8 @@ class DetailedStatus extends ImmutablePureComponent {
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
     const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
 
+    const quote = !this.props.muted && status.get('quote_id') && <CompactedStatusContainer id={status.get('quote_id')} history={this.props.history} />;
+
     return (
       <div style={outerStyle}>
         <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
@@ -349,6 +352,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
               {media}
               {hashtagBar}
+              {quote}
               {emojiReactionsBar}
             </>
           )}

app/javascript/mastodon/features/status/index.jsx

@@ -156,7 +156,7 @@ const makeMapStateToProps = () => {
     if (status) {
       ancestorsIds   = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
       descendantsIds = getDescendantsIds(state, { id: status.get('id') });
-      referenceIds   = getReferenceIds(state, { id: status.get('id') });
+      referenceIds   = getReferenceIds(state, { id: status.get('id') }).filter((id) => id !== status.get('quote_id'));
     }
 
     return {

lib/mastodon/version.rb

@@ -5,7 +5,7 @@ module Mastodon
     module_function
 
     def kmyblue_major
-      14
+      15
     end
 
     def kmyblue_minor