diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-14 19:25:03 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-14 19:25:03 +0000 |
| commit | 4b78622bbaf743d540022b8aeec41405ca0cad8f (patch) | |
| tree | 58d63391301df259173057ce8ddf81ed52014fef /lib | |
| parent | 509d8058d99d7455155b6e7fad83fed28f2ae02d (diff) | |
| parent | dce8ebc9eabac1a597491a0edc5c145285c55671 (diff) | |
| download | pleroma-4b78622bbaf743d540022b8aeec41405ca0cad8f.tar.gz | |
Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'
Unfollow should also unsubscribe
Closes #1086
See merge request pleroma/pleroma!1419
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index f1450b113..949baa3b0 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -31,7 +31,8 @@ defmodule Pleroma.Web.CommonAPI do def unfollow(follower, unfollowed) do with {:ok, follower, _follow_activity} <- User.unfollow(follower, unfollowed), - {:ok, _activity} <- ActivityPub.unfollow(follower, unfollowed) do + {:ok, _activity} <- ActivityPub.unfollow(follower, unfollowed), + {:ok, _unfollowed} <- User.unsubscribe(follower, unfollowed) do {:ok, follower} end end |