hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

User: Don't unfollow on block when the relevant setting is set.

Browse source
This commit is contained in:
lain 2020-06-26 12:06:00 +02:00
commit 15a8b70318
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/user.ex
View file

@ -1309,7 +1309,8 @@ defmodule Pleroma.User do
unsubscribe(blocked, blocker)
if following?(blocked, blocker), do: unfollow(blocked, blocker)
unfollowing_blocked = Config.get([:activitypub, :unfollow_blocked], true)
if unfollowing_blocked && following?(blocked, blocker), do: unfollow(blocked, blocker)
{:ok, blocker} = update_follower_count(blocker)
{:ok, blocker, _} = Participation.mark_all_as_read(blocker, blocked)