X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Ffollowing_relationship.ex;h=b8cb3bf0372a3960fcbbc484e77956553fcd86ca;hb=cf8307e71c3f68bc26a540783a3ca26766b3b56c;hp=2f89eb4cf6ccdbe5fa945f888e18cc59780c6c42;hpb=61fc739ab8917ccb5a12d6ab6db6130dc231990b;p=akkoma

diff --git a/lib/pleroma/following_relationship.ex b/lib/pleroma/following_relationship.ex
index 2f89eb4cf..b8cb3bf03 100644
--- a/lib/pleroma/following_relationship.ex
+++ b/lib/pleroma/following_relationship.ex
@@ -58,8 +58,8 @@ defmodule Pleroma.FollowingRelationship do
 
   def unfollow(%User{} = follower, %User{} = following) do
     case get(follower, following) do
-      nil -> {:ok, nil}
       %__MODULE__{} = following_relationship -> Repo.delete(following_relationship)
+      _ -> {:ok, nil}
     end
   end
 
@@ -101,7 +101,7 @@ defmodule Pleroma.FollowingRelationship do
       |> select([r, u], u.follower_address)
       |> Repo.all()
 
-    if not user.local or user.nickname in [nil, "internal.fetch"] do
+    if not user.local or user.invisible do
       following
     else
       [user.follower_address | following]
@@ -109,25 +109,23 @@ defmodule Pleroma.FollowingRelationship do
   end
 
   def move_following(origin, target) do
-    following_relationships =
-      __MODULE__
-      |> where(following_id: ^origin.id)
-      |> preload([:follower])
-      |> limit(50)
-      |> Repo.all()
-
-    case following_relationships do
+    __MODULE__
+    |> join(:inner, [r], f in assoc(r, :follower))
+    |> where(following_id: ^origin.id)
+    |> where([r, f], f.allow_following_move == true)
+    |> limit(50)
+    |> preload([:follower])
+    |> Repo.all()
+    |> Enum.map(fn following_relationship ->
+      Repo.delete(following_relationship)
+      Pleroma.Web.CommonAPI.follow(following_relationship.follower, target)
+    end)
+    |> case do
       [] ->
+        User.update_follower_count(origin)
         :ok
 
-      following_relationships ->
-        Enum.each(following_relationships, fn following_relationship ->
-          Repo.transaction(fn ->
-            Repo.delete(following_relationship)
-            User.follow(following_relationship.follower, target)
-          end)
-        end)
-
+      _ ->
         move_following(origin, target)
     end
   end