diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-18 21:59:22 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-18 21:59:22 +0000 |
| commit | 475fcb3e6c763ea35f755b74a8bdcdf9d90de8ab (patch) | |
| tree | 6173c54ca5bd74e75e0437c178dd886d09e4f914 /lib | |
| parent | 18c8c8d1761e49b442ceef425f5de44166266d4e (diff) | |
| parent | 58c1391c4dd7e916b54e49b0b17ea1f01cac02f3 (diff) | |
| download | pleroma-475fcb3e6c763ea35f755b74a8bdcdf9d90de8ab.tar.gz | |
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
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) |