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

diff --cc app/lib/activitypub/activity/create.rb
Simple merge

diff --cc app/services/remove_status_service.rb
Simple merge

diff --cc app/views/admin/settings/edit.html.haml
Simple merge