From 76e71f47d3324e2718c37713a5ee03d9e3f2b7fa Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Feb 2018 22:37:44 +0100 Subject: [PATCH] Inbox: Don't add the same thing twice. --- lib/pleroma/web/activity_pub/activity_pub_controller.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index f4e5ae9eb..da4973fe5 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -1,6 +1,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do use Pleroma.Web, :controller - alias Pleroma.{User, Repo, Object} + alias Pleroma.{User, Repo, Object, Activity} alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier} alias Pleroma.Web.ActivityPub.ActivityPub @@ -26,9 +26,13 @@ def object(conn, %{"uuid" => uuid}) do def inbox(%{assigns: %{valid_signature: true}} = conn, params) do # File.write("/tmp/incoming.json", Poison.encode!(params)) with {:ok, _user} <- ap_enabled_actor(params["actor"]), + nil <- Activity.get_by_ap_id(params["id"]), {:ok, activity} <- Transmogrifier.handle_incoming(params) do json(conn, "ok") else + %Activity{} -> + Logger.info("Already had #{params["id"]}") + json(conn, "ok") e -> # Just drop those for now Logger.info("Unhandled activity")