From 822b9edbfe1dd5814b144359d9c10142ba01ccdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Tue, 8 Aug 2023 23:53:21 +0200 Subject: [PATCH] Collection importing route (WIP) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- lib/pleroma/web/activity_pub/importer.ex | 9 +++++++++ .../operations/user_import_operation.ex | 18 ++++++++++++++++-- .../controllers/user_import_controller.ex | 12 ++++++++++++ lib/pleroma/web/router.ex | 1 + 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/web/activity_pub/importer.ex b/lib/pleroma/web/activity_pub/importer.ex index e17867ff68..33cfa5792d 100644 --- a/lib/pleroma/web/activity_pub/importer.ex +++ b/lib/pleroma/web/activity_pub/importer.ex @@ -65,6 +65,15 @@ def import_one(%{"type" => type} = object, %User{} = user, opts \\ []) do end end + def import_collection(%{ + "type" => type, + "orderedItems" => objects + }, user) + when type in ["OrderedCollection", "Collection"] do + objects + |> Enum.each(&import_one(&1, user)) + end + defp strip_ap_id(object), do: object |> Map.drop(["id"]) defp rewrite_actor(object, user) do diff --git a/lib/pleroma/web/api_spec/operations/user_import_operation.ex b/lib/pleroma/web/api_spec/operations/user_import_operation.ex index e99e6e6489..cc19f9ed3f 100644 --- a/lib/pleroma/web/api_spec/operations/user_import_operation.ex +++ b/lib/pleroma/web/api_spec/operations/user_import_operation.ex @@ -58,12 +58,26 @@ def mutes_operation do } end + def collection_operation do + %Operation{ + tags: ["Data import"], + summary: "Import collection", + operationId: "UserImportController.collection", + requestBody: request_body("Parameters", import_request(), required: true), + responses: %{ + 200 => ok_response(), + 500 => Operation.response("Error", "application/json", ApiError) + }, + security: [%{"oAuth" => ["write:statuses"]}] + } + end + defp import_request do %Schema{ type: :object, - required: [:list], + required: [:collection], properties: %{ - list: %Schema{ + collection: %Schema{ description: "STRING or FILE containing a whitespace-separated list of accounts to import.", anyOf: [ diff --git a/lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex b/lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex index 96466f1921..366f32cc1d 100644 --- a/lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex @@ -14,6 +14,7 @@ defmodule Pleroma.Web.PleromaAPI.UserImportController do plug(OAuthScopesPlug, %{scopes: ["follow", "write:follows"]} when action == :follow) plug(OAuthScopesPlug, %{scopes: ["follow", "write:blocks"]} when action == :blocks) plug(OAuthScopesPlug, %{scopes: ["follow", "write:mutes"]} when action == :mutes) + plug(OAuthScopesPlug, %{scopes: ["follow", "write:statuses"]} when action == :collection) plug(Pleroma.Web.ApiSpec.CastAndValidate, replace_params: false) defdelegate open_api_operation(action), to: ApiSpec.UserImportOperation @@ -74,6 +75,17 @@ defp do_mute(%{assigns: %{user: user}} = conn, list) do json(conn, "job started") end + def collection(%{body_params: %{list: %Plug.Upload{path: path}}} = conn, _) do + collection(%Plug.Conn{conn | body_params: %{list: File.read!(path)}}, %{}) + end + + def collection(%{assigns: %{user: user}, body_params: %{collection: collection}} = conn, _) do + collection + |> Jason.decode!() + |> Pleroma.Web.ActivityPub.Importer.import_collection(user) + json(conn, "job started") + end + defp prepare_user_identifiers(list) do list |> String.split() diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 6588ae9982..6e93c20288 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -567,6 +567,7 @@ defmodule Pleroma.Web.Router do post("/mutes_import", UserImportController, :mutes) post("/blocks_import", UserImportController, :blocks) post("/follow_import", UserImportController, :follow) + post("/collection_import", UserImportController, :collection) get("/accounts/mfa", TwoFactorAuthenticationController, :settings) get("/accounts/mfa/backup_codes", TwoFactorAuthenticationController, :backup_codes)