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

Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.
This commit is contained in:
Claire
2022-11-28 11:33:34 +01:00
246 changed files with 17637 additions and 6738 deletions

View File

@@ -13,6 +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]
= render 'og_description', activity: @status
= render 'og_image', activity: @status, account: @account