X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=d06fd917d9921d06c12f93de02ba016bd13ed001;hb=dd097a406baf15e983454ab8f13635b4af2a8de4;hp=c8c7f0d040bd0726f50f26ef78634c7b9feb7526;hpb=0f2f7d2cec8297b1b5645643d7584cde561ce628;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index c8c7f0d04..d06fd917d 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -100,7 +100,7 @@ defmodule Pleroma.Activity do
   def get_by_id(id) do
     Activity
     |> where([a], a.id == ^id)
-    |> restrict_disabled_users()
+    |> restrict_deactivated_users()
     |> Repo.one()
   end
 
@@ -169,7 +169,7 @@ defmodule Pleroma.Activity do
 
   def get_create_by_object_ap_id(ap_id) when is_binary(ap_id) do
     create_by_object_ap_id(ap_id)
-    |> restrict_disabled_users()
+    |> restrict_deactivated_users()
     |> Repo.one()
   end
 
@@ -296,11 +296,11 @@ defmodule Pleroma.Activity do
     end
   end
 
-  def restrict_disabled_users(query) do
+  def restrict_deactivated_users(query) do
     from(activity in query,
       where:
         fragment(
-          "? not in (SELECT ap_id FROM users WHERE info->'disabled' @> 'true')",
+          "? not in (SELECT ap_id FROM users WHERE info->'deactivated' @> 'true')",
           activity.actor
         )
     )