Merge branch 'develop' into global-status-expiration

[akkoma] / lib / pleroma / following_relationship.ex

diff --git a/lib/pleroma/following_relationship.ex b/lib/pleroma/following_relationship.ex
index dd16961364ad20671b9b3477077eda5b35c990f7..a9538ea4e4d613b8020b835781268890ca229b5a 100644 (file)
--- a/lib/pleroma/following_relationship.ex
+++ b/lib/pleroma/following_relationship.ex
@@ -135,12 +135,8 @@ defmodule Pleroma.FollowingRelationship do
         target_users
       )
       when is_list(source_users) and is_list(target_users) do
-    get_bin_ids = fn user ->
-      with {:ok, bin_id} <- CompatType.dump(user.id), do: bin_id
-    end
-
-    source_user_ids = Enum.map(source_users, &get_bin_ids.(&1))
-    target_user_ids = Enum.map(target_users, &get_bin_ids.(&1))
+    source_user_ids = User.binary_id(source_users)
+    target_user_ids = User.binary_id(target_users)
 
     __MODULE__
     |> where(
@@ -155,4 +151,10 @@ defmodule Pleroma.FollowingRelationship do
     )
     |> Repo.all()
   end
+
+  def find(following_relationships, follower, following) do
+    Enum.find(following_relationships, fn
+      fr -> fr.follower_id == follower.id and fr.following_id == following.id
+    end)
+  end
 end