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

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.

diff --cc Gemfile
index 7713bfb2b103e7c5095c69625b7d7ed798fabead,9b52c0e6c622377f76f7d595beaccdfcddfba0f7..ae999d9643b86f7ac5139c87354fdad3056e6c49
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -97,10 -97,8 +97,10 @@@ gem 'json-ld
  gem 'json-ld-preloaded', '~> 3.2'
  gem 'rdf-normalize', '~> 0.5'
  
 +gem 'redcarpet', '~> 3.5'
 +
  group :development, :test do
-   gem 'fabrication', '~> 2.24'
+   gem 'fabrication', '~> 2.27'
    gem 'fuubar', '~> 2.5'
    gem 'i18n-tasks', '~> 0.9', require: false
    gem 'pry-byebug', '~> 3.9'

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/api/v1/statuses_controller.rb
index b1390ae485de3d28f2c29c685d400ed2bac94998,2d82a7a99b8a5e46aee17263cbed6e6de8e8b53c..c928a24def8ebac494acfd47c5ef9bfcaa2d7b9e
--- 1/app/controllers/api/v1/statuses_controller.rb
--- 2/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@@ -35,19 -35,21 +35,22 @@@ class Api::V1::StatusesController < Api
    end
  
    def create
-     @status = PostStatusService.new.call(current_user.account,
-                                          text: status_params[:status],
-                                          thread: @thread,
-                                          media_ids: status_params[:media_ids],
-                                          sensitive: status_params[:sensitive],
-                                          spoiler_text: status_params[:spoiler_text],
-                                          visibility: status_params[:visibility],
-                                          scheduled_at: status_params[:scheduled_at],
-                                          application: doorkeeper_token.application,
-                                          poll: status_params[:poll],
-                                          content_type: status_params[:content_type],
-                                          idempotency: request.headers['Idempotency-Key'],
-                                          with_rate_limit: true)
+     @status = PostStatusService.new.call(
+       current_user.account,
+       text: status_params[:status],
+       thread: @thread,
+       media_ids: status_params[:media_ids],
+       sensitive: status_params[:sensitive],
+       spoiler_text: status_params[:spoiler_text],
+       visibility: status_params[:visibility],
+       language: status_params[:language],
+       scheduled_at: status_params[:scheduled_at],
+       application: doorkeeper_token.application,
+       poll: status_params[:poll],
++      content_type: status_params[:content_type],
+       idempotency: request.headers['Idempotency-Key'],
+       with_rate_limit: true
+     )
  
      render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
    end
@@@ -85,8 -104,8 +105,9 @@@
        :sensitive,
        :spoiler_text,
        :visibility,
+       :language,
        :scheduled_at,
 +      :content_type,
        media_ids: [],
        poll: [
          :multiple,

diff --cc app/javascript/mastodon/actions/compose.js
index 7c3bbcbd83782d6c51cf42dee9302bf895059dda,b0a217550ff3c30e71a9f38f01b17297ae156148..f3129f8d9e5be21f3f70f774470de72ea5c26103
--- 1/app/javascript/mastodon/actions/compose.js
--- 2/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@@ -180,11 -195,9 +195,11 @@@ export function submitCompose(routerHis
          insertIfOnline('home');
        }
  
-       if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
+       if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility === 'public') {
          insertIfOnline('community');
 -        insertIfOnline('public');
 +        if (!response.data.local_only) {
 +          insertIfOnline('public');
 +        }
          insertIfOnline(`account:${response.data.account.id}`);
        }
      }).catch(function (error) {

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
Simple merge

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

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

diff --cc app/policies/status_policy.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc spec/policies/status_policy_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge