Allow local quote and private self-quote

2 files changed, 21 insertions, 2 deletions

diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex
index d4875765c..32921aa5a 100644
--- a/lib/pleroma/web/common_api/activity_draft.ex
+++ b/lib/pleroma/web/common_api/activity_draft.ex
@@ -167,9 +167,21 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
     end
   end
 
+  defp can_quote?(_draft, _object, visibility) when visibility in ~w(public unlisted local) do
+    true
+  end
+
+  defp can_quote?(draft, object, "private") do
+    draft.user.ap_id == object.data["actor"]
+  end
+
+  defp can_quote?(_, _, _) do
+    false
+  end
+
   defp quoting_visibility(%{quote_post: %Activity{}} = draft) do
     with %Object{} = object <- Object.normalize(draft.quote_post, fetch: false),
-         visibility when visibility in ~w(public unlisted) <- Visibility.get_visibility(object) do
+         true <- can_quote?(draft, object, Visibility.get_visibility(object)) do
       draft
     else
       _ -> add_error(draft, dgettext("errors", "Cannot quote private message"))
diff --git a/test/pleroma/web/common_api/activity_draft_test.exs b/test/pleroma/web/common_api/activity_draft_test.exs
index 8a09fc710..02bc6cf3b 100644
--- a/test/pleroma/web/common_api/activity_draft_test.exs
+++ b/test/pleroma/web/common_api/activity_draft_test.exs
@@ -12,15 +12,22 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraftTest do
 
   test "create/2 with a quote post" do
     user = insert(:user)
+    another_user = insert(:user)
 
     {:ok, direct} = CommonAPI.post(user, %{status: ".", visibility: "direct"})
     {:ok, private} = CommonAPI.post(user, %{status: ".", visibility: "private"})
     {:ok, unlisted} = CommonAPI.post(user, %{status: ".", visibility: "unlisted"})
+    {:ok, local} = CommonAPI.post(user, %{status: ".", visibility: "local"})
     {:ok, public} = CommonAPI.post(user, %{status: ".", visibility: "public"})
 
     {:error, _} = ActivityDraft.create(user, %{status: "nice", quote_id: direct.id})
-    {:error, _} = ActivityDraft.create(user, %{status: "nice", quote_id: private.id})
+    {:ok, _} = ActivityDraft.create(user, %{status: "nice", quote_id: private.id})
+    {:error, _} = ActivityDraft.create(another_user, %{status: "nice", quote_id: private.id})
     {:ok, _} = ActivityDraft.create(user, %{status: "nice", quote_id: unlisted.id})
+    {:ok, _} = ActivityDraft.create(another_user, %{status: "nice", quote_id: unlisted.id})
+    {:ok, _} = ActivityDraft.create(user, %{status: "nice", quote_id: local.id})
+    {:ok, _} = ActivityDraft.create(another_user, %{status: "nice", quote_id: local.id})
     {:ok, _} = ActivityDraft.create(user, %{status: "nice", quote_id: public.id})
+    {:ok, _} = ActivityDraft.create(another_user, %{status: "nice", quote_id: public.id})
   end
 end