projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 72ee2d58e2951a615e247e574faf480c8e1180e2..c5c74d132038825cd10d4763e3ff7fd8123dfc4e 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-1489,6
+1489,8
@@
defmodule Pleroma.User do
delete_user_activities(user)
delete_user_activities(user)
+ delete_outgoing_pending_follow_requests(user)
+
delete_or_deactivate(user)
end
delete_or_deactivate(user)
end
@@
-1611,6
+1613,12
@@
defmodule Pleroma.User do
defp delete_activity(_activity, _user), do: "Doing nothing"
defp delete_activity(_activity, _user), do: "Doing nothing"
+ defp delete_outgoing_pending_follow_requests(user) do
+ user
+ |> FollowingRelationship.outgoing_pending_follow_requests_query()
+ |> Repo.delete_all()
+ end
+
def html_filter_policy(%User{no_rich_text: true}) do
Pleroma.HTML.Scrubber.TwitterText
end
def html_filter_policy(%User{no_rich_text: true}) do
Pleroma.HTML.Scrubber.TwitterText
end