From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 10 Feb 2022 18:09:27 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f1a6f9062e00c0651680bf4d5d750ec0b078ac5a;p=mastodon.git

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`.
---

f1a6f9062e00c0651680bf4d5d750ec0b078ac5a
diff --cc Gemfile
index 7713bfb2b,9b52c0e6c..ae999d964
--- a/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 app/controllers/api/v1/statuses_controller.rb
index b1390ae48,2d82a7a99..c928a24de
--- a/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 7c3bbcbd8,b0a217550..f3129f8d9
--- a/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) {