diff options
| author | feld <feld@feld.me> | 2019-11-14 13:35:41 +0000 | 
|---|---|---|
| committer | feld <feld@feld.me> | 2019-11-14 13:35:41 +0000 | 
| commit | 1afeaf82fa3f1718233f5012f851912f87f35a88 (patch) | |
| tree | 8d0e6b91d34edc574cf18c9188eaadf2e69443b4 /lib | |
| parent | 574369b42dd7b62e41c3a4429e4e66b9a9b3483d (diff) | |
| parent | 46787b9fe1c61d5139198187a0d2013f1a2e5162 (diff) | |
| download | pleroma-1afeaf82fa3f1718233f5012f851912f87f35a88.tar.gz pleroma-1afeaf82fa3f1718233f5012f851912f87f35a88.zip | |
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/activity.ex | 17 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/utils.ex | 142 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 46 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/views/report_view.ex | 20 | ||||
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 7 | ||||
| -rw-r--r-- | lib/pleroma/web/router.ex | 3 | 
6 files changed, 197 insertions, 38 deletions
| diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index c1065611b..7e283df32 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -41,6 +41,10 @@ defmodule Pleroma.Activity do      field(:actor, :string)      field(:recipients, {:array, :string}, default: [])      field(:thread_muted?, :boolean, virtual: true) + +    # This is a fake relation, +    # do not use outside of with_preloaded_user_actor/with_joined_user_actor +    has_one(:user_actor, User, on_delete: :nothing, foreign_key: :id)      # This is a fake relation, do not use outside of with_preloaded_bookmark/get_bookmark      has_one(:bookmark, Bookmark)      has_many(:notifications, Notification, on_delete: :delete_all) @@ -86,6 +90,19 @@ defmodule Pleroma.Activity do      |> preload([activity, object: object], object: object)    end +  def with_joined_user_actor(query, join_type \\ :inner) do +    join(query, join_type, [activity], u in User, +      on: u.ap_id == activity.actor, +      as: :user_actor +    ) +  end + +  def with_preloaded_user_actor(query, join_type \\ :inner) do +    query +    |> with_joined_user_actor(join_type) +    |> preload([activity, user_actor: user_actor], user_actor: user_actor) +  end +    def with_preloaded_bookmark(query, %User{} = user) do      from([a] in query,        left_join: b in Bookmark, diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 91cfa2194..c45662359 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -11,6 +11,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do    alias Pleroma.Repo    alias Pleroma.User    alias Pleroma.Web +  alias Pleroma.Web.ActivityPub.ActivityPub    alias Pleroma.Web.ActivityPub.Visibility    alias Pleroma.Web.AdminAPI.AccountView    alias Pleroma.Web.Endpoint @@ -706,26 +707,31 @@ defmodule Pleroma.Web.ActivityPub.Utils do    def make_flag_data(_, _), do: %{}    defp build_flag_object(%{account: account, statuses: statuses} = _) do -    [account.ap_id] ++ -      Enum.map(statuses || [], fn act -> -        id = -          case act do -            %Activity{} = act -> act.data["id"] -            act when is_map(act) -> act["id"] -            act when is_binary(act) -> act -          end +    [account.ap_id] ++ build_flag_object(%{statuses: statuses}) +  end -        activity = Activity.get_by_ap_id_with_object(id) -        actor = User.get_by_ap_id(activity.object.data["actor"]) +  defp build_flag_object(%{statuses: statuses}) do +    Enum.map(statuses || [], &build_flag_object/1) +  end -        %{ -          "type" => "Note", -          "id" => activity.data["id"], -          "content" => activity.object.data["content"], -          "published" => activity.object.data["published"], -          "actor" => AccountView.render("show.json", %{user: actor}) -        } -      end) +  defp build_flag_object(act) when is_map(act) or is_binary(act) do +    id = +      case act do +        %Activity{} = act -> act.data["id"] +        act when is_map(act) -> act["id"] +        act when is_binary(act) -> act +      end + +    activity = Activity.get_by_ap_id_with_object(id) +    actor = User.get_by_ap_id(activity.object.data["actor"]) + +    %{ +      "type" => "Note", +      "id" => activity.data["id"], +      "content" => activity.object.data["content"], +      "published" => activity.object.data["published"], +      "actor" => AccountView.render("show.json", %{user: actor}) +    }    end    defp build_flag_object(_), do: [] @@ -770,6 +776,94 @@ defmodule Pleroma.Web.ActivityPub.Utils do    end    #### Report-related helpers +  def get_reports(params, page, page_size) do +    params = +      params +      |> Map.put("type", "Flag") +      |> Map.put("skip_preload", true) +      |> Map.put("total", true) +      |> Map.put("limit", page_size) +      |> Map.put("offset", (page - 1) * page_size) + +    ActivityPub.fetch_activities([], params, :offset) +  end + +  @spec get_reports_grouped_by_status(%{required(:activity) => String.t()}) :: %{ +          required(:groups) => [ +            %{ +              required(:date) => String.t(), +              required(:account) => %{}, +              required(:status) => %{}, +              required(:actors) => [%User{}], +              required(:reports) => [%Activity{}] +            } +          ], +          required(:total) => integer +        } +  def get_reports_grouped_by_status(groups) do +    parsed_groups = +      groups +      |> Enum.map(fn entry -> +        activity = +          case Jason.decode(entry.activity) do +            {:ok, activity} -> activity +            _ -> build_flag_object(entry.activity) +          end + +        parse_report_group(activity) +      end) + +    %{ +      groups: parsed_groups +    } +  end + +  def parse_report_group(activity) do +    reports = get_reports_by_status_id(activity["id"]) +    max_date = Enum.max_by(reports, &NaiveDateTime.from_iso8601!(&1.data["published"])) +    actors = Enum.map(reports, & &1.user_actor) + +    %{ +      date: max_date.data["published"], +      account: activity["actor"], +      status: %{ +        id: activity["id"], +        content: activity["content"], +        published: activity["published"] +      }, +      actors: Enum.uniq(actors), +      reports: reports +    } +  end + +  def get_reports_by_status_id(ap_id) do +    from(a in Activity, +      where: fragment("(?)->>'type' = 'Flag'", a.data), +      where: fragment("(?)->'object' @> ?", a.data, ^[%{id: ap_id}]) +    ) +    |> Activity.with_preloaded_user_actor() +    |> Repo.all() +  end + +  @spec get_reported_activities() :: [ +          %{ +            required(:activity) => String.t(), +            required(:date) => String.t() +          } +        ] +  def get_reported_activities do +    from(a in Activity, +      where: fragment("(?)->>'type' = 'Flag'", a.data), +      select: %{ +        date: fragment("max(?->>'published') date", a.data), +        activity: +          fragment("jsonb_array_elements_text((? #- '{object,0}')->'object') activity", a.data) +      }, +      group_by: fragment("activity"), +      order_by: fragment("date DESC") +    ) +    |> Repo.all() +  end    def update_report_state(%Activity{} = activity, state)        when state in @strip_status_report_states do @@ -793,6 +887,18 @@ defmodule Pleroma.Web.ActivityPub.Utils do      |> Repo.update()    end +  def update_report_state(activity_ids, state) when state in @supported_report_states do +    activities_num = length(activity_ids) + +    from(a in Activity, where: a.id in ^activity_ids) +    |> update(set: [data: fragment("jsonb_set(data, '{state}', ?)", ^state)]) +    |> Repo.update_all([]) +    |> case do +      {^activities_num, _} -> :ok +      _ -> {:error, activity_ids} +    end +  end +    def update_report_state(_, _), do: {:error, "Unsupported state"}    def strip_report_status_data(activity) do diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 30fc01755..8c1318d1b 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -11,6 +11,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do    alias Pleroma.UserInviteToken    alias Pleroma.Web.ActivityPub.ActivityPub    alias Pleroma.Web.ActivityPub.Relay +  alias Pleroma.Web.ActivityPub.Utils    alias Pleroma.Web.AdminAPI.AccountView    alias Pleroma.Web.AdminAPI.Config    alias Pleroma.Web.AdminAPI.ConfigView @@ -624,19 +625,17 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do    def list_reports(conn, params) do      {page, page_size} = page_params(params) -    params = -      params -      |> Map.put("type", "Flag") -      |> Map.put("skip_preload", true) -      |> Map.put("total", true) -      |> Map.put("limit", page_size) -      |> Map.put("offset", (page - 1) * page_size) +    conn +    |> put_view(ReportView) +    |> render("index.json", %{reports: Utils.get_reports(params, page, page_size)}) +  end -    reports = ActivityPub.fetch_activities([], params, :offset) +  def list_grouped_reports(conn, _params) do +    reports = Utils.get_reported_activities()      conn      |> put_view(ReportView) -    |> render("index.json", %{reports: reports}) +    |> render("index_grouped.json", Utils.get_reports_grouped_by_status(reports))    end    def report_show(conn, %{"id" => id}) do @@ -649,17 +648,26 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do      end    end -  def report_update_state(%{assigns: %{user: admin}} = conn, %{"id" => id, "state" => state}) do -    with {:ok, report} <- CommonAPI.update_report_state(id, state) do -      ModerationLog.insert_log(%{ -        action: "report_update", -        actor: admin, -        subject: report -      }) +  def reports_update(%{assigns: %{user: admin}} = conn, %{"reports" => reports}) do +    result = +      reports +      |> Enum.map(fn report -> +        with {:ok, activity} <- CommonAPI.update_report_state(report["id"], report["state"]) do +          ModerationLog.insert_log(%{ +            action: "report_update", +            actor: admin, +            subject: activity +          }) + +          activity +        else +          {:error, message} -> %{id: report["id"], error: message} +        end +      end) -      conn -      |> put_view(ReportView) -      |> render("show.json", Report.extract_report_info(report)) +    case Enum.any?(result, &Map.has_key?(&1, :error)) do +      true -> json_response(conn, :bad_request, result) +      false -> json_response(conn, :no_content, "")      end    end diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex index 101a74c63..ca88595c7 100644 --- a/lib/pleroma/web/admin_api/views/report_view.ex +++ b/lib/pleroma/web/admin_api/views/report_view.ex @@ -42,6 +42,26 @@ defmodule Pleroma.Web.AdminAPI.ReportView do      }    end +  def render("index_grouped.json", %{groups: groups}) do +    reports = +      Enum.map(groups, fn group -> +        %{ +          date: group[:date], +          account: group[:account], +          status: group[:status], +          actors: Enum.map(group[:actors], &merge_account_views/1), +          reports: +            group[:reports] +            |> Enum.map(&Report.extract_report_info(&1)) +            |> Enum.map(&render(__MODULE__, "show.json", &1)) +        } +      end) + +    %{ +      reports: reports +    } +  end +    defp merge_account_views(%User{} = user) do      Pleroma.Web.MastodonAPI.AccountView.render("show.json", %{user: user})      |> Map.merge(Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user})) diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index f1937b1ec..fe6e26a90 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -370,6 +370,13 @@ defmodule Pleroma.Web.CommonAPI do      end    end +  def update_report_state(activity_ids, state) when is_list(activity_ids) do +    case Utils.update_report_state(activity_ids, state) do +      :ok -> {:ok, activity_ids} +      _ -> {:error, dgettext("errors", "Could not update state")} +    end +  end +    def update_report_state(activity_id, state) do      with %Activity{} = activity <- Activity.get_by_id(activity_id) do        Utils.update_report_state(activity, state) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 93e7e45f9..9b8b373b8 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -178,8 +178,9 @@ defmodule Pleroma.Web.Router do      get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)      get("/reports", AdminAPIController, :list_reports) +    get("/grouped_reports", AdminAPIController, :list_grouped_reports)      get("/reports/:id", AdminAPIController, :report_show) -    put("/reports/:id", AdminAPIController, :report_update_state) +    patch("/reports", AdminAPIController, :reports_update)      post("/reports/:id/respond", AdminAPIController, :report_respond)      put("/statuses/:id", AdminAPIController, :status_update) | 
