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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc spec/models/concerns/account_interactions_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge