diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-15 14:11:54 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-15 14:11:54 +0700 |
commit | 64a946643e6f9159a8029be8ec9e0b71b04906f3 (patch) | |
tree | bf44cb695880f368aa2976fe134e83baea60927a /lib/pleroma/web/common_api | |
parent | a87c313309b73ced5970c59d00117c357f51fecb (diff) | |
parent | 46ef8f021635c630bcd6973e6fbb7c58bcafb6bf (diff) | |
download | pleroma-64a946643e6f9159a8029be8ec9e0b71b04906f3.tar.gz |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'lib/pleroma/web/common_api')
-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 f764e87af..44669b228 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 |