Merge remote-tracking branch 'parent/main' into kb-merge-231010

app/javascript/mastodon/actions/alerts.js

@@ -56,4 +56,4 @@ export const showAlertForError = (error, skipNotFound = false) => {
     title: messages.unexpectedTitle,
     message: messages.unexpectedMessage,
   });
-}
+};

app/javascript/mastodon/actions/compose.js

@@ -290,7 +290,7 @@ export function submitComposeWithCircleSuccess(status, circleId) {
     type: COMPOSE_WITH_CIRCLE_SUCCESS,
     status,
     circleId,
-  }
+  };
 }
 
 export function submitComposeFail(error) {

app/javascript/mastodon/actions/importer/normalizer.js

@@ -121,7 +121,7 @@ export function normalizeStatus(status, normalOldStatus) {
       normalStatus.media_attachments.forEach(item => {
         const oldItem = list.find(i => i.get('id') === item.id);
         if (oldItem && oldItem.get('description') === item.description) {
-          item.translation = oldItem.get('translation')
+          item.translation = oldItem.get('translation');
         }
       });
     }
@@ -165,13 +165,13 @@ export function normalizePoll(poll, normalOldPoll) {
       ...option,
       voted: poll.own_votes && poll.own_votes.includes(index),
       titleHtml: emojify(escapeTextContentForBrowser(option.title), emojiMap),
-    }
+    };
 
     if (normalOldPoll && normalOldPoll.getIn(['options', index, 'title']) === option.title) {
       normalOption.translation = normalOldPoll.getIn(['options', index, 'translation']);
     }
 
-    return normalOption
+    return normalOption;
   });
 
   return normalPoll;

app/javascript/mastodon/actions/streaming.js

@@ -192,4 +192,4 @@ export const connectListStream = listId =>
  * @returns {function(): void}
  */
 export const connectAntennaStream = antennaId =>
-connectTimelineStream(`antenna:${antennaId}`, 'antenna', { antenna: antennaId }, { fillGaps: () => fillAntennaTimelineGaps(antennaId) });
+  connectTimelineStream(`antenna:${antennaId}`, 'antenna', { antenna: antennaId }, { fillGaps: () => fillAntennaTimelineGaps(antennaId) });