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

Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.

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

@@ -6,8 +6,7 @@ import { Link } from 'react-router-dom';
 
 import { useDispatch, useSelector } from 'react-redux';
 
-
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationPolicy } from 'mastodon/actions/notifications';
 import { Icon } from 'mastodon/components/icon';
 import { toCappedNumber } from 'mastodon/utils/numbers';
@@ -34,7 +33,7 @@ export const FilteredNotificationsBanner = () => {
 
   return (
     <Link className='filtered-notifications-banner' to='/notifications/requests'>
-      <Icon icon={ArchiveIcon} />
+      <Icon icon={InventoryIcon} />
 
       <div className='filtered-notifications-banner__text'>
         <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>

app/javascript/mastodon/features/notifications/request.jsx

@@ -7,8 +7,8 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
 import Column from 'mastodon/components/column';
@@ -94,7 +94,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
     <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
       <ColumnHeader
         icon='archive'
-        iconComponent={ArchiveIcon}
+        iconComponent={InventoryIcon}
         title={columnTitle}
         onClick={handleHeaderClick}
         multiColumn={multiColumn}

app/javascript/mastodon/features/notifications/requests.jsx

@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { useSelector, useDispatch } from 'react-redux';
 
-import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
@@ -43,7 +43,7 @@ export const NotificationRequests = ({ multiColumn }) => {
     <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
       <ColumnHeader
         icon='archive'
-        iconComponent={ArchiveIcon}
+        iconComponent={InventoryIcon}
         title={intl.formatMessage(messages.title)}
         onClick={handleHeaderClick}
         multiColumn={multiColumn}

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

@@ -304,7 +304,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
             <div className='detailed-status__meta__line'>
               {reblogLink}
-              ·
+              {reblogLink && <>·</>}
               {favouriteLink}
             </div>
           </div>

app/javascript/mastodon/features/ui/components/mute_modal.jsx

@@ -118,7 +118,7 @@ export const MuteModal = ({ accountId, acct }) => {
             <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
-            <RadioButtonLabel name='duration' value='x' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='2592000' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
           </div>
 
           <div className='safety-action-modal__field-group'>