X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fweb%2Ffederator.ex;h=3a00424c67b72ec848e5a49cc4578e8cbf64ffe4;hb=9a320ba8149a3efae1235b3b68dbf1bbad423e0d;hp=658d20954ccbb86edf4f4e189453b8e71d54534e;hpb=b122b6ffa318af30586f9da0532135959804a6a0;p=akkoma
diff --git a/lib/pleroma/web/federator.ex b/lib/pleroma/web/federator.ex
index 658d20954..3a00424c6 100644
--- a/lib/pleroma/web/federator.ex
+++ b/lib/pleroma/web/federator.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Federator do
@@ -47,10 +47,27 @@ defmodule Pleroma.Web.Federator do
end
@impl true
- def publish(activity) do
- PublisherWorker.enqueue("publish", %{"activity_id" => activity.id})
+ def publish(%{data: %{"object" => object}} = activity) when is_binary(object) do
+ PublisherWorker.enqueue("publish", %{"activity_id" => activity.id, "object_data" => nil},
+ priority: publish_priority(activity)
+ )
end
+ @impl true
+ def publish(%{data: %{"object" => object}} = activity) when is_map(object) or is_list(object) do
+ PublisherWorker.enqueue(
+ "publish",
+ %{
+ "activity_id" => activity.id,
+ "object_data" => Jason.encode!(object)
+ },
+ priority: publish_priority(activity)
+ )
+ end
+
+ defp publish_priority(%{data: %{"type" => "Delete"}}), do: 3
+ defp publish_priority(_), do: 0
+
# Job Worker Callbacks
@spec perform(atom(), module(), any()) :: {:ok, any()} | {:error, any()}
@@ -61,10 +78,8 @@ defmodule Pleroma.Web.Federator do
def perform(:publish, activity) do
Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end)
- with %User{} = actor <- User.get_cached_by_ap_id(activity.data["actor"]),
- {:ok, actor} <- User.ensure_keys_present(actor) do
- Publisher.publish(actor, activity)
- end
+ %User{} = actor = User.get_cached_by_ap_id(activity.data["actor"])
+ Publisher.publish(actor, activity)
end
def perform(:incoming_ap_doc, params) do
@@ -96,6 +111,11 @@ defmodule Pleroma.Web.Federator do
Logger.debug("Unhandled actor #{actor}, #{inspect(e)}")
{:error, e}
+ {:error, {:validate_object, _}} = e ->
+ Logger.error("Incoming AP doc validation error: #{inspect(e)}")
+ Logger.debug(Jason.encode!(params, pretty: true))
+ e
+
e ->
# Just drop those for now
Logger.debug(fn -> "Unhandled activity\n" <> Jason.encode!(params, pretty: true) end)