aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/pleroma_api
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-04-29 14:26:31 +0300
committerrinpatch <rinpatch@sdf.org>2020-05-02 19:05:13 +0300
commite55876409b523d81bc19db876bc90f29ba80a47c (patch)
treeb85e0ab309c870f2b5bbb6d3bd94b0dff3de3856 /lib/pleroma/web/pleroma_api
parente186d9941d4cf4708186681fcea60b23919c46ed (diff)
downloadpleroma-e55876409b523d81bc19db876bc90f29ba80a47c.tar.gz
Deactivate local users on deletion instead of deleting the record
Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687
Diffstat (limited to 'lib/pleroma/web/pleroma_api')
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
index 2c1874051..1bdb3aa4d 100644
--- a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@ -61,7 +61,10 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
else
users =
Enum.map(user_ap_ids, &User.get_cached_by_ap_id/1)
- |> Enum.filter(& &1)
+ |> Enum.filter(fn
+ %{deactivated: false} -> true
+ _ -> false
+ end)
%{
name: emoji,