X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=ec161074dbf25cab2aba8dcda08e5ee468dd68e6;hb=9e0dd21ed637ec7b884570b2ad8705b5fac72580;hp=bfb0e04be137382bbe90893eec063671914969ce;hpb=4a178b3d6589bbb9ab08e8a768cc0a3a5d5e9629;p=akkoma diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index bfb0e04be..ec161074d 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -65,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 @@ -144,6 +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, activity), + {:ok, unannounce_activity} <- insert(unannounce_data, local), + :ok <- maybe_federate(activity), + {:ok, _activity} <- Repo.delete(activity), + {:ok, object} <- remove_announce_from_object(activity, object) do + {:ok, unannounce_activity, activity, object} + else + _e -> {:ok, object} + end + end + def follow(follower, followed, activity_id \\ nil, local \\ true) do with data <- make_follow_data(follower, followed, activity_id), {:ok, activity} <- insert(data, local), @@ -175,7 +189,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