hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move user disable into deactivation

Browse source
This commit is contained in:
Egor Kislitsyn 2019-04-11 17:22:42 +07:00
commit db4badc6aa
12 changed files with 36 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/activity.ex
View file

@ -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
)
)