moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Pleroma.Config instead of Application.get_env

This commit is contained in:
Sadposter 2019-04-08 13:04:30 +01:00
parent 13ff312c48
commit 87a01f9ee0
No known key found for this signature in database
GPG Key ID: 6F3BAD60DE190290
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/user.ex
View File

@ -924,8 +924,7 @@ def unmute(muter, %{ap_id: ap_id}) do
end end
def subscribe(subscriber, %{ap_id: ap_id}) do def subscribe(subscriber, %{ap_id: ap_id}) do
user_config = Application.get_env(:pleroma, :user) deny_follow_blocked = Pleroma.Config.get([:user, :deny_follow_blocked])
deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
with %User{} = subscribed <- get_or_fetch_by_ap_id(ap_id) do with %User{} = subscribed <- get_or_fetch_by_ap_id(ap_id) do
blocked = blocks?(subscribed, subscriber) and deny_follow_blocked blocked = blocks?(subscribed, subscriber) and deny_follow_blocked