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

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did.

app/javascript/packs/public.jsx

@@ -48,7 +48,6 @@ function loaded() {
     };
   };
 
-  ready(() => {
   const locale = document.documentElement.lang;
 
   const dateTimeFormat = new Intl.DateTimeFormat(locale, {
@@ -202,7 +201,7 @@ function loaded() {
     const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
     spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
   });
-  });
+}
 
 const toggleSidebar = () => {
   const sidebar = document.querySelector('.sidebar ul');
@@ -241,8 +240,6 @@ function loaded() {
     }
   });
 });
-}
-
 
 function main() {
   ready(loaded);