Merge remote-tracking branch 'parent/main' into upstream-20230103

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

@@ -179,7 +179,7 @@ class Footer extends ImmutablePureComponent {
 
     if (status.get('in_reply_to_id', null) === null) {
       replyIcon = 'reply';
-      replyIconComponent = RepeatIcon;
+      replyIconComponent = ReplyIcon;
       replyTitle = intl.formatMessage(messages.reply);
     } else {
       replyIcon = 'reply-all';

app/javascript/mastodon/features/report/components/status_check_box.jsx

@@ -47,7 +47,7 @@ class StatusCheckBox extends PureComponent {
         </div>
 
         <StatusContent status={status} />
-        <MediaAttachments status={status} />
+        <MediaAttachments status={status} visible={false} />
       </div>
     );
 

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

@@ -222,7 +222,7 @@ class FocalPointModal extends ImmutablePureComponent {
       const worker = createWorker({
         workerPath: tesseractWorkerPath,
         corePath: tesseractCorePath,
-        langPath: `${assetHost}/ocr/lang-data/`,
+        langPath: `${assetHost}/ocr/lang-data`,
         logger: ({ status, progress }) => {
           if (status === 'recognizing text') {
             this.setState({ ocrStatus: 'detecting', progress });