Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream

Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.

app/javascript/mastodon/features/picture_in_picture/components/footer.tsx

@@ -233,7 +233,10 @@ export const Footer: React.FC<{
         icon='retweet'
         iconComponent={reblogIconComponent}
         onClick={handleReblogClick}
-        counter={status.get('reblogs_count') as number}
+        counter={
+          (status.get('reblogs_count') as number) +
+          (status.get('quotes_count') as number)
+        }
       />
 
       <IconButton

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

@@ -127,6 +127,7 @@ export const DetailedStatus: React.FC<{
   let media;
   let applicationLink;
   let reblogLink;
+  let quotesLink;
   let attachmentAspectRatio;
 
   if (properStatus.get('media_attachments').getIn([0, 'type']) === 'video') {
@@ -279,6 +280,23 @@ export const DetailedStatus: React.FC<{
     );
   }
 
+  if (['private', 'direct'].includes(status.get('visibility') as string)) {
+    quotesLink = '';
+  } else {
+    quotesLink = (
+      <span className='detailed-status__link'>
+        <span className='detailed-status__quotes'>
+          <AnimatedNumber value={status.get('quotes_count')} />
+        </span>
+        <FormattedMessage
+          id='status.quotes'
+          defaultMessage='{count, plural, one {quote} other {quotes}}'
+          values={{ count: status.get('quotes_count') }}
+        />
+      </span>
+    );
+  }
+
   const favouriteLink = (
     <Link
       to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`}
@@ -420,6 +438,8 @@ export const DetailedStatus: React.FC<{
           <div className='detailed-status__meta__line'>
             {reblogLink}
             {reblogLink && <>·</>}
+            {quotesLink}
+            {quotesLink && <>·</>}
             {favouriteLink}
           </div>
         </div>

app/javascript/mastodon/features/ui/components/visibility_modal.tsx

@@ -39,7 +39,7 @@ const messages = defineMessages({
   },
   quoteNobody: {
     id: 'visibility_modal.quote_nobody',
-    defaultMessage: 'No one',
+    defaultMessage: 'Just me',
   },
 });
 
@@ -253,7 +253,7 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
                 items={quoteItems}
                 onChange={handleQuotePolicyChange}
                 classPrefix='visibility-dropdown'
-                current={quotePolicy}
+                current={disableQuotePolicy ? 'nobody' : quotePolicy}
                 title={intl.formatMessage(messages.buttonTitle)}
                 disabled={disableQuotePolicy}
                 id={quoteDropdownId}
@@ -302,7 +302,7 @@ const QuotePolicyHelper: FC<{
       <p className='visibility-dropdown__helper'>
         <FormattedMessage
           id='visibility_modal.helper.private_quoting'
-          defaultMessage="Follower-only posts can't be quoted."
+          defaultMessage="Follower-only posts authored on Mastodon can't be quoted by others."
         />
       </p>
     );
@@ -313,7 +313,7 @@ const QuotePolicyHelper: FC<{
       <p className='visibility-dropdown__helper'>
         <FormattedMessage
           id='visibility_modal.helper.direct_quoting'
-          defaultMessage="Private mentions can't be quoted."
+          defaultMessage="Private mentions authored on Mastodon can't be quoted by others."
         />
       </p>
     );