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

2018-10-07 19:47:56 +02:00
parent 7cc7843109 25744d43b0
commit 611740ce81
50 changed files with 1503 additions and 60 deletions
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@ -22,7 +22,7 @@ class Api::V1::ReportsController < Api::BaseController
  private

  def reported_status_ids
-    Status.find(status_ids).pluck(:id)
+    reported_account.statuses.find(status_ids).pluck(:id)
  end

  def status_ids