aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-04 14:17:03 +0200
committerlain <lain@soykaf.club>2020-08-04 14:17:03 +0200
commit1a00713744803824b16efd575c9c6880b1d1a57e (patch)
treea73a36a75842d62469c0e0e64b57cb64c960b197 /lib/pleroma
parent0cfadcf2caf84e2db944036576bad888a9707ff1 (diff)
downloadpleroma-1a00713744803824b16efd575c9c6880b1d1a57e.tar.gz
CommonValidations: Treat deactivated users as not present.
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/web/activity_pub/object_validators/common_validations.ex13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/pleroma/web/activity_pub/object_validators/common_validations.ex b/lib/pleroma/web/activity_pub/object_validators/common_validations.ex
index aeef31945..bd46f8034 100644
--- a/lib/pleroma/web/activity_pub/object_validators/common_validations.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/common_validations.ex
@@ -34,10 +34,15 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations do
cng
|> validate_change(field_name, fn field_name, actor ->
- if User.get_cached_by_ap_id(actor) do
- []
- else
- [{field_name, "can't find user"}]
+ case User.get_cached_by_ap_id(actor) do
+ %User{deactivated: true} ->
+ [{field_name, "user is deactivated"}]
+
+ %User{} ->
+ []
+
+ _ ->
+ [{field_name, "can't find user"}]
end
end)
end