X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=c5b51474269fb7afd76494cdf003c512db472752;hb=a079ec3a3cdfd42d2cbd51c7698c2c87828e5778;hp=01c9df53b6fde56252154999ae7ebf5667219a89;hpb=5796d81d9877de51b2669da7d8f6fcc903c0ebda;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 01c9df53b..c5b514742 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -367,10 +367,24 @@ defmodule Pleroma.Activity do
     |> Repo.all()
   end
 
-  def restrict_deactivated_users(query) do
-    deactivated_users_query = from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
+  def follow_activity(%User{ap_id: ap_id}, %User{ap_id: followed_ap_id}) do
+    Queries.by_type("Follow")
+    |> where([a], a.actor == ^ap_id)
+    |> where([a], fragment("?->>'object' = ?", a.data, ^followed_ap_id))
+    |> where([a], fragment("?->>'state'", a.data) in ["pending", "accept"])
+    |> Repo.one()
+  end
 
-    from(activity in query, where: activity.actor not in subquery(deactivated_users_query))
+  def restrict_deactivated_users(query) do
+    query
+    |> join(
+      :inner_lateral,
+      [activity],
+      active in fragment(
+        "SELECT is_active from users WHERE ap_id = ? AND is_active = TRUE",
+        activity.actor
+      )
+    )
   end
 
   defdelegate search(user, query, options \\ []), to: Pleroma.Search.DatabaseSearch