Allow listing languages, setting source language (#192)

[akkoma] / lib / pleroma / web / federator.ex

diff --git a/lib/pleroma/web/federator.ex b/lib/pleroma/web/federator.ex
index 186861fd9d1cb2c87b2a1f48804e463ad65a5e4f..82fb9e4e005b70a92523b328529ae7dff1d281b7 100644 (file)
--- a/lib/pleroma/web/federator.ex
+++ b/lib/pleroma/web/federator.ex
@@ -1,11 +1,7 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Web.Federator.Publishing do
-  @callback publish(map()) :: any()
-end
-
 defmodule Pleroma.Web.Federator do
   alias Pleroma.Activity
   alias Pleroma.Object.Containment
@@ -51,8 +47,16 @@ 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})
+  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)
+    })
   end
 
   # Job Worker Callbacks
@@ -100,6 +104,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)