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

Conflicts:
- `app/validators/status_length_validator.rb`:
  Conflict due to glitch-soc's configurable maximum toot chars.
  Ported upstream changes.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/validators/status_length_validator.rb
index dcbc4a41a75b2a0b90b74da2ef5a636e21c28f03,d036f19256b2de6ac1b7f014ba9059f2e884e2be..11997024fba1ec3252ca320206dad3fce7aaa72a
--- 1/app/validators/status_length_validator.rb
--- 2/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@@ -1,13 -1,7 +1,7 @@@
  # frozen_string_literal: true
  
  class StatusLengthValidator < ActiveModel::Validator
 -  MAX_CHARS = 500
 +  MAX_CHARS = (ENV['MAX_TOOT_CHARS'] || 500).to_i
-   URL_PATTERN = %r{
-     (?:
-       (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]})
-       (#{FetchLinkCardService::URL_PATTERN})
-     )
-   }iox
    URL_PLACEHOLDER = "\1#{'x' * 23}"
  
    def validate(status)

diff --cc app/views/admin/action_logs/index.html.haml
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge