diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 17:38:11 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 17:38:11 +0100 |
| commit | 60abcb3c4c4ba899f0b4bb477c1629ecc2cd4a59 (patch) | |
| tree | 02c9edee1c75254299e5385966eb8508f6ec0670 /app/controllers/api/v1/statuses_controller.rb | |
| parent | 472fd4307f9c963aba57e537e3ca3a8f94dfa139 (diff) | |
| parent | 3588fbc76641311ab97ef530e2df4df4934805c5 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
Diffstat (limited to 'app/controllers/api/v1/statuses_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/statuses_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index e2e48f633..3a9cf056b 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -80,6 +80,7 @@ class Api::V1::StatusesController < Api::BaseController current_account.id, text: status_params[:status], media_ids: status_params[:media_ids], + media_attributes: status_params[:media_attributes], sensitive: status_params[:sensitive], language: status_params[:language], spoiler_text: status_params[:spoiler_text], @@ -131,6 +132,12 @@ class Api::V1::StatusesController < Api::BaseController :scheduled_at, :content_type, media_ids: [], + media_attributes: [ + :id, + :thumbnail, + :description, + :focus, + ], poll: [ :multiple, :hide_totals, |