diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-02 20:48:27 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-02 20:48:27 +0100 |
commit | 8743b1ea40425a83cc72834e823320439fd2fa02 (patch) | |
tree | 0bdfaca0357df1326bd3efb2e1a8319e719a2047 /app/controllers/api/v1/reports_controller.rb | |
parent | d9e30efa5ecc87bc9be7b2e28baaf34bd01032f5 (diff) | |
parent | c0c4b5718d8827fc59d5564c227e848547a2cb69 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes.
Diffstat (limited to 'app/controllers/api/v1/reports_controller.rb')
-rw-r--r-- | app/controllers/api/v1/reports_controller.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb index 052d70cc8..8ff6c8fe5 100644 --- a/app/controllers/api/v1/reports_controller.rb +++ b/app/controllers/api/v1/reports_controller.rb @@ -10,9 +10,7 @@ class Api::V1::ReportsController < Api::BaseController @report = ReportService.new.call( current_account, reported_account, - status_ids: reported_status_ids, - comment: report_params[:comment], - forward: report_params[:forward] + report_params ) render json: @report, serializer: REST::ReportSerializer @@ -20,14 +18,6 @@ class Api::V1::ReportsController < Api::BaseController private - def reported_status_ids - reported_account.statuses.with_discarded.find(status_ids).pluck(:id) - end - - def status_ids - Array(report_params[:status_ids]) - end - def reported_account Account.find(report_params[:account_id]) end |