Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.

app/views/statuses/_poll.html.haml

@@ -17,7 +17,7 @@
               %span.poll__voted
                 %i.poll__voted__mark.fa.fa-check
 
-          %progress{ max: 100, value: percent < 1 ? 1 : percent, 'aria-hidden': 'true' }
+          %progress{ max: 100, value: [percent, 1].max, 'aria-hidden': 'true' }
             %span.poll__chart
         - else
           %label.poll__option><

app/views/statuses/show.html.haml

@@ -13,7 +13,7 @@
   = opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})"
   = opengraph 'og:url', short_account_status_url(@account, @status)
   = opengraph 'og:published_time', @status.created_at.iso8601
-  = opengraph 'profile:username', acct(@account)[1..-1]
+  = opengraph 'profile:username', acct(@account)[1..]
 
   = render 'og_description', activity: @status
   = render 'og_image', activity: @status, account: @account