Merge branch 'develop' into preload-data

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 72ee2d58e..c5c74d132 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1489,6 +1489,8 @@ defmodule Pleroma.User do
 
     delete_user_activities(user)
 
+    delete_outgoing_pending_follow_requests(user)
+
     delete_or_deactivate(user)
   end
 
@@ -1611,6 +1613,12 @@ defmodule Pleroma.User do
 
   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