From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 1 Jun 2021 16:32:30 +0000 (-0500)
Subject: Merge remote-tracking branch 'pleroma/develop' into cycles-constants
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=c435de426d045118ed7be3d77f659f349d2d2245;hp=-c;p=akkoma

Merge remote-tracking branch 'pleroma/develop' into cycles-constants
---

c435de426d045118ed7be3d77f659f349d2d2245
diff --combined lib/pleroma/web/activity_pub/builder.ex
index f74888b67,91a45836f..cde477710
--- a/lib/pleroma/web/activity_pub/builder.ex
+++ b/lib/pleroma/web/activity_pub/builder.ex
@@@ -223,7 -223,7 +223,7 @@@ defmodule Pleroma.Web.ActivityPub.Build
            [actor.follower_address]
  
          public? and Visibility.is_local_public?(object) ->
 -          [actor.follower_address, object.data["actor"], Pleroma.Constants.as_local_public()]
 +          [actor.follower_address, object.data["actor"], Utils.as_local_public()]
  
          public? ->
            [actor.follower_address, object.data["actor"], Pleroma.Constants.as_public()]
@@@ -273,4 -273,36 +273,36 @@@
         "context" => object.data["context"]
       }, []}
    end
+ 
+   @spec pin(User.t(), Object.t()) :: {:ok, map(), keyword()}
+   def pin(%User{} = user, object) do
+     {:ok,
+      %{
+        "id" => Utils.generate_activity_id(),
+        "target" => pinned_url(user.nickname),
+        "object" => object.data["id"],
+        "actor" => user.ap_id,
+        "type" => "Add",
+        "to" => [Pleroma.Constants.as_public()],
+        "cc" => [user.follower_address]
+      }, []}
+   end
+ 
+   @spec unpin(User.t(), Object.t()) :: {:ok, map, keyword()}
+   def unpin(%User{} = user, object) do
+     {:ok,
+      %{
+        "id" => Utils.generate_activity_id(),
+        "target" => pinned_url(user.nickname),
+        "object" => object.data["id"],
+        "actor" => user.ap_id,
+        "type" => "Remove",
+        "to" => [Pleroma.Constants.as_public()],
+        "cc" => [user.follower_address]
+      }, []}
+   end
+ 
+   defp pinned_url(nickname) when is_binary(nickname) do
+     Pleroma.Web.Router.Helpers.activity_pub_url(Pleroma.Web.Endpoint, :pinned, nickname)
+   end
  end
diff --combined lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
index 004500742,576341790..a2f752ac3
--- a/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
@@@ -50,7 -50,7 +50,7 @@@ defmodule Pleroma.Web.ActivityPub.Objec
      cng
    end
  
-   def validate_data(data_cng) do
+   defp validate_data(data_cng) do
      data_cng
      |> validate_inclusion(:type, ["Announce"])
      |> validate_required([:id, :type, :object, :actor, :to, :cc])
@@@ -68,7 -68,7 +68,7 @@@
           false <- Visibility.is_public?(object) do
        same_actor = object.data["actor"] == actor.ap_id
        recipients = get_field(cng, :to) ++ get_field(cng, :cc)
 -      local_public = Pleroma.Constants.as_local_public()
 +      local_public = Utils.as_local_public()
  
        is_public =
          Enum.member?(recipients, Pleroma.Constants.as_public()) or
diff --combined lib/pleroma/web/activity_pub/utils.ex
index 984f39aa7,0513498aa..1df53f79a
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@@ -12,7 -12,6 +12,6 @@@ defmodule Pleroma.Web.ActivityPub.Util
    alias Pleroma.Object
    alias Pleroma.Repo
    alias Pleroma.User
-   alias Pleroma.Web
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.ActivityPub.Visibility
    alias Pleroma.Web.AdminAPI.AccountView
@@@ -38,8 -37,6 +37,8 @@@
    @supported_report_states ~w(open closed resolved)
    @valid_visibilities ~w(public unlisted private direct)
  
-   def as_local_public, do: Web.base_url() <> "/#Public"
++  def as_local_public, do: Endpoint.url() <> "/#Public"
 +
    # Some implementations send the actor URI as the actor field, others send the entire actor object,
    # so figure out what the actor's URI is based on what we have.
    def get_ap_id(%{"id" => id} = _), do: id
@@@ -98,8 -95,11 +97,11 @@@
          !label_in_collection?(ap_id, params["cc"])
  
      if need_splice? do
-       cc_list = extract_list(params["cc"])
-       Map.put(params, "cc", [ap_id | cc_list])
+       cc = [ap_id | extract_list(params["cc"])]
+ 
+       params
+       |> Map.put("cc", cc)
+       |> Maps.safe_put_in(["object", "cc"], cc)
      else
        params
      end
@@@ -109,7 -109,7 +111,7 @@@
      %{
        "@context" => [
          "https://www.w3.org/ns/activitystreams",
-         "#{Web.base_url()}/schemas/litepub-0.1.jsonld",
+         "#{Endpoint.url()}/schemas/litepub-0.1.jsonld",
          %{
            "@language" => "und"
          }
@@@ -134,7 -134,7 +136,7 @@@
    end
  
    def generate_id(type) do
-     "#{Web.base_url()}/#{type}/#{UUID.generate()}"
+     "#{Endpoint.url()}/#{type}/#{UUID.generate()}"
    end
  
    def get_notified_from_object(%{"type" => type} = object) when type in @supported_object_types do
diff --combined lib/pleroma/web/common_api/utils.ex
index 93bb8e8fa,94a378e11..4cc34002d
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@@ -69,7 -69,7 +69,7 @@@ defmodule Pleroma.Web.CommonAPI.Utils d
      to =
        case visibility do
          "public" -> [Pleroma.Constants.as_public() | draft.mentions]
 -        "local" -> [Pleroma.Constants.as_local_public() | draft.mentions]
 +        "local" -> [Utils.as_local_public() | draft.mentions]
        end
  
      cc = [draft.user.follower_address]
@@@ -217,7 -217,6 +217,6 @@@
      draft.status
      |> format_input(content_type, options)
      |> maybe_add_attachments(draft.attachments, attachment_links)
-     |> maybe_add_nsfw_tag(draft.params)
    end
  
    defp get_content_type(content_type) do
@@@ -228,13 -227,6 +227,6 @@@
      end
    end
  
-   defp maybe_add_nsfw_tag({text, mentions, tags}, %{"sensitive" => sensitive})
-        when sensitive in [true, "True", "true", "1"] do
-     {text, mentions, [{"#nsfw", "nsfw"} | tags]}
-   end
- 
-   defp maybe_add_nsfw_tag(data, _), do: data
- 
    def make_context(_, %Participation{} = participation) do
      Repo.preload(participation, :conversation).conversation.ap_id
    end
@@@ -294,7 -286,7 +286,7 @@@
    def format_input(text, "text/markdown", options) do
      text
      |> Formatter.mentions_escape(options)
-     |> Earmark.as_html!(%Earmark.Options{renderer: Pleroma.EarmarkRenderer})
+     |> Formatter.markdown_to_html()
      |> Formatter.linkify(options)
      |> Formatter.html_escape("text/html")
    end
diff --combined test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index fe0a5c28d,99ad87d05..055dd4bea
--- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@@ -14,7 -14,6 +14,7 @@@ defmodule Pleroma.Web.MastodonAPI.Statu
    alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.Web.ActivityPub.ActivityPub
 +  alias Pleroma.Web.ActivityPub.Utils
    alias Pleroma.Web.CommonAPI
  
    import Pleroma.Factory
@@@ -359,7 -358,6 +359,6 @@@
        assert activity.data["cc"] == []
      end
  
-     @tag :skip
      test "discloses application metadata when enabled" do
        user = insert(:user, disclose_client: true)
        %{user: _user, token: token, conn: conn} = oauth_access(["write:statuses"], user: user)
@@@ -378,6 -376,16 +377,16 @@@
            "status" => "cofe is my copilot"
          })
  
+       assert %{
+                "content" => "cofe is my copilot"
+              } = json_response_and_validate_schema(result, 200)
+ 
+       activity = result.assigns.activity.id
+ 
+       result =
+         conn
+         |> get("api/v1/statuses/#{activity}")
+ 
        assert %{
                 "content" => "cofe is my copilot",
                 "application" => %{
@@@ -398,6 -406,15 +407,15 @@@
            "status" => "club mate is my wingman"
          })
  
+       assert %{"content" => "club mate is my wingman"} =
+                json_response_and_validate_schema(result, 200)
+ 
+       activity = result.assigns.activity.id
+ 
+       result =
+         conn
+         |> get("api/v1/statuses/#{activity}")
+ 
        assert %{
                 "content" => "club mate is my wingman",
                 "application" => nil
@@@ -1192,20 -1209,27 +1210,27 @@@
      setup do: clear_config([:instance, :max_pinned_statuses], 1)
  
      test "pin status", %{conn: conn, user: user, activity: activity} do
-       id_str = to_string(activity.id)
+       id = activity.id
  
-       assert %{"id" => ^id_str, "pinned" => true} =
+       assert %{"id" => ^id, "pinned" => true} =
                 conn
                 |> put_req_header("content-type", "application/json")
                 |> post("/api/v1/statuses/#{activity.id}/pin")
                 |> json_response_and_validate_schema(200)
  
-       assert [%{"id" => ^id_str, "pinned" => true}] =
+       assert [%{"id" => ^id, "pinned" => true}] =
                 conn
                 |> get("/api/v1/accounts/#{user.id}/statuses?pinned=true")
                 |> json_response_and_validate_schema(200)
      end
  
+     test "non authenticated user", %{activity: activity} do
+       assert build_conn()
+              |> put_req_header("content-type", "application/json")
+              |> post("/api/v1/statuses/#{activity.id}/pin")
+              |> json_response(403) == %{"error" => "Invalid credentials."}
+     end
+ 
      test "/pin: returns 400 error when activity is not public", %{conn: conn, user: user} do
        {:ok, dm} = CommonAPI.post(user, %{status: "test", visibility: "direct"})
  
@@@ -1214,7 -1238,18 +1239,18 @@@
          |> put_req_header("content-type", "application/json")
          |> post("/api/v1/statuses/#{dm.id}/pin")
  
-       assert json_response_and_validate_schema(conn, 400) == %{"error" => "Could not pin"}
+       assert json_response_and_validate_schema(conn, 422) == %{
+                "error" => "Non-public status cannot be pinned"
+              }
+     end
+ 
+     test "pin by another user", %{activity: activity} do
+       %{conn: conn} = oauth_access(["write:accounts"])
+ 
+       assert conn
+              |> put_req_header("content-type", "application/json")
+              |> post("/api/v1/statuses/#{activity.id}/pin")
+              |> json_response(422) == %{"error" => "Someone else's status cannot be pinned"}
      end
  
      test "unpin status", %{conn: conn, user: user, activity: activity} do
@@@ -1235,13 -1270,11 +1271,11 @@@
                 |> json_response_and_validate_schema(200)
      end
  
-     test "/unpin: returns 400 error when activity is not exist", %{conn: conn} do
-       conn =
-         conn
-         |> put_req_header("content-type", "application/json")
-         |> post("/api/v1/statuses/1/unpin")
- 
-       assert json_response_and_validate_schema(conn, 400) == %{"error" => "Could not unpin"}
+     test "/unpin: returns 404 error when activity doesn't exist", %{conn: conn} do
+       assert conn
+              |> put_req_header("content-type", "application/json")
+              |> post("/api/v1/statuses/1/unpin")
+              |> json_response_and_validate_schema(404) == %{"error" => "Record not found"}
      end
  
      test "max pinned statuses", %{conn: conn, user: user, activity: activity_one} do
@@@ -1876,7 -1909,7 +1910,7 @@@
          "visibility" => "local"
        })
  
 -    local = Pleroma.Constants.as_local_public()
 +    local = Utils.as_local_public()
  
      assert %{"content" => "cofe", "id" => id, "visibility" => "local"} =
               json_response(conn_one, 200)