only non-reblogs, self-authored, public statuses can be pinned

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 6d22813b20d57a63bfe0b096e1665b7a6afa390c..7ec6aa0ea8eff3089c7535c78c9e2d73b2909668 100644 (file)
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -165,8 +165,18 @@ defmodule Pleroma.Web.CommonAPI do
     })
   end
 
-  def pin(id_or_ap_id, user) do
-    with %Activity{} = activity <- get_by_id_or_ap_id(id_or_ap_id),
+  def pin(id_or_ap_id, %{ap_id: user_ap_id} = user) do
+    with %Activity{
+           actor: ^user_ap_id,
+           data: %{
+             "type" => "Create",
+             "object" => %{
+               "to" => object_to,
+               "type" => "Note"
+             }
+           }
+         } = activity <- get_by_id_or_ap_id(id_or_ap_id),
+         true <- Enum.member?(object_to, "https://www.w3.org/ns/activitystreams#Public"),
          %{valid?: true} = info_changeset <-
            Pleroma.User.Info.add_pinnned_activity(user.info, activity),
          changeset <-

diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index 7d5ceb3982c7dad0e4f646156fc952f14dec3d2d..84b264439fe02c1f94ae00202267803b16f16567 100644 (file)
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -107,6 +107,16 @@ defmodule Pleroma.Web.CommonAPI.Test do
       assert {:ok, ^activity} = CommonAPI.pin(activity.id, user)
     end
 
+    test "only self-authored can be pinned" do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
+      user_one = insert(:user)
+      user_two = insert(:user)
+
+      {:ok, activity} = CommonAPI.post(user_one, %{"status" => "HI!!!"})
+
+      assert {:error, "Could not pin"} = CommonAPI.pin(activity.id, user_two)
+    end
+
     test "max pinned statuses" do
       Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)