diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-29 11:24:07 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-29 11:24:07 +0000 |
| commit | 07c7f16356d5fe0ce15554a5981c4adee7294f13 (patch) | |
| tree | 84cdfe178614a4ab331642d70067c7b64f2089d6 /lib | |
| parent | e80f90e9dbdb6955e355d6a06eb69ee7051ba6df (diff) | |
| parent | 5334190056b853dda57f16cbbaa230e8947821c6 (diff) | |
| download | pleroma-07c7f16356d5fe0ce15554a5981c4adee7294f13.tar.gz | |
Merge branch 'fix-follow-requests' into 'develop'
FIx follow requests
Closes #1357
See merge request pleroma/pleroma!1918
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 3c27b0d46..91a164eff 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -507,6 +507,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do }) {:user_locked, true} -> + {:ok, _relationship} = FollowingRelationship.update(follower, followed, "pending") :noop end |