X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=334cfcc5b15aabca6d87d911c2f4c042bd3c5ee4;hb=4d5ec883b7e7f54d92574a4cf0bdda781e7423e2;hp=dccd2e7577c2c8c97497182bc03915ba2f800a1f;hpb=7b4f55238eeb8561c6a8e43321cd965667cefabe;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index dccd2e757..334cfcc5b 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -10,6 +10,9 @@ 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"] || [])
   end
@@ -17,7 +20,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) do
+         :ok <- insert_full_object(map),
+         {:ok, map} <- @rewrite_policy.filter(map) do
       {:ok, activity} =
         Repo.insert(%Activity{
           data: map,
@@ -61,7 +65,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
              additional
            ),
          {:ok, activity} <- insert(create_data, local),
-         :ok <- maybe_federate(activity) do
+         :ok <- maybe_federate(activity),
+         {:ok, actor} <- User.increase_note_count(actor) do
       {:ok, activity}
     end
   end
@@ -140,13 +145,19 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
-  def unannounce(%User{} = actor, %Object{} = object, local \\ true) do
-    with %Activity{} = activity <- get_existing_announce(actor.ap_id, object),
-         unannounce_data <- make_unannounce_data(actor, object),
+  def unannounce(
+        %User{} = actor,
+        %Object{} = object,
+        local \\ true,
+        activity_id \\ nil
+      ) do
+    with %Activity{} = announce_activity <- get_existing_announce(actor.ap_id, object),
+         unannounce_data <- make_unannounce_data(actor, announce_activity, activity_id),
          {:ok, unannounce_activity} <- insert(unannounce_data, local),
-         {:ok, _activity} <- Repo.delete(activity),
-         {:ok, object} <- remove_announce_from_object(activity, object) do
-      {:ok, unannounce_activity, activity, object}
+         :ok <- maybe_federate(unannounce_activity),
+         {:ok, _activity} <- Repo.delete(announce_activity),
+         {:ok, object} <- remove_announce_from_object(announce_activity, object) do
+      {:ok, unannounce_activity, announce_activity, object}
     else
       _e -> {:ok, object}
     end
@@ -183,7 +194,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     with Repo.delete(object),
          Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
          {:ok, activity} <- insert(data, local),
-         :ok <- maybe_federate(activity) do
+         :ok <- maybe_federate(activity),
+         {:ok, actor} <- User.decrease_note_count(user) do
       {:ok, activity}
     end
   end