Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -1,6 +1,6 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
-  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.ActivityPub.{Transmogrifier, MRF}
   alias Pleroma.Web.WebFinger
   alias Pleroma.Web.Federator
   alias Pleroma.Web.OStatus
@@ -11,7 +11,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   @httpoison Application.get_env(:pleroma, :httpoison)
 
   @instance Application.get_env(:pleroma, :instance)
-  @rewrite_policy Keyword.get(@instance, :rewrite_policy)
 
   def get_recipients(data) do
     (data["to"] || []) ++ (data["cc"] || [])
@@ -20,8 +19,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def insert(map, local \\ true) when is_map(map) do
     with nil <- Activity.get_by_ap_id(map["id"]),
          map <- lazy_put_activity_defaults(map),
-         :ok <- insert_full_object(map),
-         {:ok, map} <- @rewrite_policy.filter(map) do
+         {:ok, map} <- MRF.filter(map),
+         :ok <- insert_full_object(map) do
       {:ok, activity} =
         Repo.insert(%Activity{
           data: map,
@@ -66,7 +65,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
            ),
          {:ok, activity} <- insert(create_data, local),
          :ok <- maybe_federate(activity),
-         {:ok, actor} <- User.increase_note_count(actor) do
+         {:ok, _actor} <- User.increase_note_count(actor) do
       {:ok, activity}
     end
   end
@@ -177,7 +176,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
          Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
          {:ok, activity} <- insert(data, local),
          :ok <- maybe_federate(activity),
-         {:ok, actor} <- User.decrease_note_count(user) do
+         {:ok, _actor} <- User.decrease_note_count(user) do
       {:ok, activity}
     end
   end
@@ -236,7 +235,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_tag(query, _), do: query
 
-  defp restrict_recipients(query, [], user), do: query
+  defp restrict_recipients(query, [], _user), do: query
 
   defp restrict_recipients(query, recipients, nil) do
     from(activity in query, where: fragment("? && ?", ^recipients, activity.recipients))
@@ -313,7 +312,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do
     blocks = info["blocks"] || []
-    from(activity in query,
+
+    from(
+      activity in query,
       where: fragment("not (? = ANY(?))", activity.actor, ^blocks),
       where: fragment("not (?->'to' \\?| ?)", activity.data, ^blocks)
     )
@@ -405,7 +406,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def make_user_from_ap_id(ap_id) do
-    if user = User.get_by_ap_id(ap_id) do
+    if _user = User.get_by_ap_id(ap_id) do
       Transmogrifier.upgrade_user_from_ap_id(ap_id)
     else
       with {:ok, data} <- fetch_and_prepare_user_from_ap_id(ap_id) do
@@ -501,7 +502,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         object = %Object{} ->
           {:ok, object}
 
-        e ->
+        _e ->
           Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
 
           case OStatus.fetch_activity_from_url(id) do

lib/pleroma/web/activity_pub/activity_pub_controller.ex

@@ -1,7 +1,7 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
-  alias Pleroma.{User, Repo, Object, Activity}
-  alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
+  alias Pleroma.{User, Object}
+  alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.Federator
 

lib/pleroma/web/activity_pub/mrf.ex

@@ -0,0 +1,24 @@
+defmodule Pleroma.Web.ActivityPub.MRF do
+  @callback filter(Map.t()) :: {:ok | :reject, Map.t()}
+
+  def filter(object) do
+    get_policies()
+    |> Enum.reduce({:ok, object}, fn
+      policy, {:ok, object} ->
+        policy.filter(object)
+
+      _, error ->
+        error
+    end)
+  end
+
+  def get_policies() do
+    Application.get_env(:pleroma, :instance, [])
+    |> Keyword.get(:rewrite_policy, [])
+    |> get_policies()
+  end
+
+  defp get_policies(policy) when is_atom(policy), do: [policy]
+  defp get_policies(policies) when is_list(policies), do: policies
+  defp get_policies(_), do: []
+end

lib/pleroma/web/activity_pub/mrf/drop_policy.ex

@@ -1,6 +1,8 @@
 defmodule Pleroma.Web.ActivityPub.MRF.DropPolicy do
   require Logger
+  @behaviour Pleroma.Web.ActivityPub.MRF
 
+  @impl true
   def filter(object) do
     Logger.info("REJECTING #{inspect(object)}")
     {:reject, object}

lib/pleroma/web/activity_pub/mrf/noop_policy.ex

@@ -1,4 +1,7 @@
 defmodule Pleroma.Web.ActivityPub.MRF.NoOpPolicy do
+  @behaviour Pleroma.Web.ActivityPub.MRF
+
+  @impl true
   def filter(object) do
     {:ok, object}
   end

lib/pleroma/web/activity_pub/mrf/simple_policy.ex

@@ -1,5 +1,6 @@
 defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
   alias Pleroma.User
+  @behaviour Pleroma.Web.ActivityPub.MRF
 
   @mrf_policy Application.get_env(:pleroma, :mrf_simple)
 
@@ -17,9 +18,10 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
     if actor_info.host in @media_removal do
       child_object = Map.delete(object["object"], "attachment")
       object = Map.put(object, "object", child_object)
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
   @media_nsfw Keyword.get(@mrf_policy, :media_nsfw)
@@ -32,9 +34,10 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
       child_object = Map.put(child_object, "tags", tags)
       child_object = Map.put(child_object, "sensitive", true)
       object = Map.put(object, "object", child_object)
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
   @ftl_removal Keyword.get(@mrf_policy, :federated_timeline_removal)
@@ -43,24 +46,31 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
       user = User.get_by_ap_id(object["actor"])
 
       # flip to/cc relationship to make the post unlisted
-      if "https://www.w3.org/ns/activitystreams#Public" in object["to"] and
-           user.follower_address in object["cc"] do
-        to =
-          List.delete(object["to"], "https://www.w3.org/ns/activitystreams#Public") ++
-            [user.follower_address]
+      object =
+        if "https://www.w3.org/ns/activitystreams#Public" in object["to"] and
+             user.follower_address in object["cc"] do
+          to =
+            List.delete(object["to"], "https://www.w3.org/ns/activitystreams#Public") ++
+              [user.follower_address]
 
-        cc =
-          List.delete(object["cc"], user.follower_address) ++
-            ["https://www.w3.org/ns/activitystreams#Public"]
+          cc =
+            List.delete(object["cc"], user.follower_address) ++
+              ["https://www.w3.org/ns/activitystreams#Public"]
 
-        object = Map.put(object, "to", to)
-        object = Map.put(object, "cc", cc)
-      end
+          object
+          |> Map.put("to", to)
+          |> Map.put("cc", cc)
+        else
+          object
+        end
+
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
+  @impl true
   def filter(object) do
     actor_info = URI.parse(object["actor"])
 
@@ -70,7 +80,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
          {:ok, object} <- check_ftl_removal(actor_info, object) do
       {:ok, object}
     else
-      e -> {:reject, nil}
+      _e -> {:reject, nil}
     end
   end
 end

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -72,9 +72,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       |> Enum.reduce(%{}, fn data, mapping ->
         name = data["name"]
 
-        if String.starts_with?(name, ":") do
-          name = name |> String.slice(1..-2)
-        end
+        name =
+          if String.starts_with?(name, ":") do
+            name |> String.slice(1..-2)
+          else
+            name
+          end
 
         mapping |> Map.put(name, data["icon"]["url"])
       end)
@@ -143,12 +146,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   end
 
   def handle_incoming(
-        %{"type" => "Like", "object" => object_id, "actor" => actor, "id" => id} = data
+        %{"type" => "Like", "object" => object_id, "actor" => actor, "id" => id} = _data
       ) do
     with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
          {:ok, object} <-
            get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
-         {:ok, activity, object} <- ActivityPub.like(actor, object, id, false) do
+         {:ok, activity, _object} <- ActivityPub.like(actor, object, id, false) do
       {:ok, activity}
     else
       _e -> :error
@@ -156,12 +159,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   end
 
   def handle_incoming(
-        %{"type" => "Announce", "object" => object_id, "actor" => actor, "id" => id} = data
+        %{"type" => "Announce", "object" => object_id, "actor" => actor, "id" => id} = _data
       ) do
     with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
          {:ok, object} <-
            get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
-         {:ok, activity, object} <- ActivityPub.announce(actor, object, id, false) do
+         {:ok, activity, _object} <- ActivityPub.announce(actor, object, id, false) do
       {:ok, activity}
     else
       _e -> :error
@@ -202,7 +205,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   # TODO: Make secure.
   def handle_incoming(
-        %{"type" => "Delete", "object" => object_id, "actor" => actor, "id" => id} = data
+        %{"type" => "Delete", "object" => object_id, "actor" => actor, "id" => _id} = _data
       ) do
     object_id =
       case object_id do
@@ -210,13 +213,13 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         id -> id
       end
 
-    with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
+    with %User{} = _actor <- User.get_or_fetch_by_ap_id(actor),
          {:ok, object} <-
            get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
          {:ok, activity} <- ActivityPub.delete(object, false) do
       {:ok, activity}
     else
-      e -> :error
+      _e -> :error
     end
   end
 
@@ -254,10 +257,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> set_reply_to_uri
   end
 
-  @doc
-  """
-  internal -> Mastodon
-  """
+  #  @doc
+  #  """
+  #  internal -> Mastodon
+  #  """
 
   def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
     object =
@@ -272,7 +275,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
-  def prepare_outgoing(%{"type" => type} = data) do
+  def prepare_outgoing(%{"type" => _type} = data) do
     data =
       data
       |> maybe_fix_object_url
@@ -286,7 +289,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       case ActivityPub.fetch_object_from_id(data["object"]) do
         {:ok, relative_object} ->
           if relative_object.data["external_url"] do
-            data =
+            _data =
               data
               |> Map.put("object", relative_object.data["external_url"])
           else

lib/pleroma/web/activity_pub/views/user_view.ex

@@ -47,25 +47,6 @@ defmodule Pleroma.Web.ActivityPub.UserView do
     |> Map.merge(Utils.make_json_ld_header())
   end
 
-  def collection(collection, iri, page, total \\ nil) do
-    offset = (page - 1) * 10
-    items = Enum.slice(collection, offset, 10)
-    items = Enum.map(items, fn user -> user.ap_id end)
-    total = total || length(collection)
-
-    map = %{
-      "id" => "#{iri}?page=#{page}",
-      "type" => "OrderedCollectionPage",
-      "partOf" => iri,
-      "totalItems" => length(collection),
-      "orderedItems" => items
-    }
-
-    if offset < length(collection) do
-      Map.put(map, "next", "#{iri}?page=#{page + 1}")
-    end
-  end
-
   def render("following.json", %{user: user, page: page}) do
     query = User.get_friends_query(user)
     query = from(user in query, select: [:ap_id])
@@ -123,9 +104,12 @@ defmodule Pleroma.Web.ActivityPub.UserView do
       "limit" => "10"
     }
 
-    if max_qid != nil do
-      params = Map.put(params, "max_id", max_qid)
-    end
+    params =
+      if max_qid != nil do
+        Map.put(params, "max_id", max_qid)
+      else
+        params
+      end
 
     activities = ActivityPub.fetch_public_activities(params)
     min_id = Enum.at(activities, 0).id
@@ -162,4 +146,23 @@ defmodule Pleroma.Web.ActivityPub.UserView do
       page |> Map.merge(Utils.make_json_ld_header())
     end
   end
+
+  def collection(collection, iri, page, total \\ nil) do
+    offset = (page - 1) * 10
+    items = Enum.slice(collection, offset, 10)
+    items = Enum.map(items, fn user -> user.ap_id end)
+    total = total || length(collection)
+
+    map = %{
+      "id" => "#{iri}?page=#{page}",
+      "type" => "OrderedCollectionPage",
+      "partOf" => iri,
+      "totalItems" => total,
+      "orderedItems" => items
+    }
+
+    if offset < total do
+      Map.put(map, "next", "#{iri}?page=#{page + 1}")
+    end
+  end
 end