diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-08-18 20:29:31 +0100 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-08-18 20:30:57 +0100 |
| commit | 94e336d9d5731c236e17d58f66a6a1678ca148f7 (patch) | |
| tree | f3671b812659eaab96efaf02e51f92be7f9e1943 /lib | |
| parent | 7ab2dbbdb60e08a6b142e62b2f50561427715bd4 (diff) | |
| download | pleroma-94e336d9d5731c236e17d58f66a6a1678ca148f7.tar.gz | |
clear follow requests when blocking a user
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 5c3c8a8a2..829de6e31 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -21,6 +21,7 @@ defmodule Pleroma.User do alias Pleroma.Web alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils alias Pleroma.Web.OAuth alias Pleroma.Web.OStatus @@ -914,6 +915,13 @@ defmodule Pleroma.User do blocker end + # clear any requested follows as well + blocked = + case CommonAPI.reject_follow_request(blocked, blocker) do + {:ok, %User{} = updated_blocked} -> updated_blocked + nil -> blocked + end + blocker = if subscribed_to?(blocked, blocker) do {:ok, blocker} = unsubscribe(blocked, blocker) |