From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 25 May 2018 09:38:07 +0000 (+0000)
Subject: activitypub transmogrifier: clean up accept/reject handling a bit
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f35e6bf75bf81496a5c7192780d9db62ba6b42a9;p=akkoma

activitypub transmogrifier: clean up accept/reject handling a bit
---

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 525b74135..519548788 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -171,7 +171,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
          {:ok, follow_activity} <- get_follow_activity(follow_object),
          %User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity["actor"]) do
-      User.follow(follower, followed)
+      if not User.following?(follower, followed) do
+        User.follow(follower, followed)
+      end
 
       {:ok, data}
     end
@@ -182,10 +184,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       ) do
     with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
          {:ok, follow_activity} <- get_follow_activity(follow_object),
-         %User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity["actor"]),
-         {:ok, follow_activity} <- Utils.fetch_latest_follow(follower, followed),
-         {:ok, activity} <- ActivityPub.delete(follow_activity, false) do
-      {:ok, activity}
+         %User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity["actor"]) do
+      User.unfollow(follower, followed)
+
+      {:ok, data}
     end
   end