sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mind-crushingly dumb syntax error

Browse Source
This commit is contained in:
squidboi 2018-06-23 14:32:00 -07:00
parent f4990283de
commit c4038ede07
No known key found for this signature in database
GPG Key ID: 018925A9B65D2457
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/user.ex
View File

@ -169,8 +169,8 @@ def register_changeset(struct, params \\ %{}) do
end end
def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do
user_config Application.get_env(:pleroma, :user) user_config = Application.get_env(:pleroma, :user)
deny_follow_blocked Keyword.get(user_config, :deny_follow_blocked) deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
user_info = user_info(followed) user_info = user_info(followed)
@ -210,8 +210,8 @@ def maybe_follow(%User{} = follower, %User{info: info} = followed) do
end end
def follow(%User{} = follower, %User{info: info} = followed) do def follow(%User{} = follower, %User{info: info} = followed) do
user_config Application.get_env(:pleroma, :user) user_config = Application.get_env(:pleroma, :user)
deny_follow_blocked Keyword.get(user_config, :deny_follow_blocked) deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
ap_followers = followed.follower_address ap_followers = followed.follower_address

6
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -243,9 +243,9 @@ def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ tru
end end
def block(blocker, blocked, activity_id \\ nil, local \\ true) do def block(blocker, blocked, activity_id \\ nil, local \\ true) do
ap_config Application.get_env(:pleroma, :activitypub) ap_config = Application.get_env(:pleroma, :activitypub)
unfollow_blocked Keyword.get(ap_config, :unfollow_blocked) unfollow_blocked = Keyword.get(ap_config, :unfollow_blocked)
outgoing_blocks Keyword.get(ap_config, :outgoing_blocks) outgoing_blocks = Keyword.get(ap_config, :outgoing_blocks)
with true <- unfollow_blocked do with true <- unfollow_blocked do
follow_activity = fetch_latest_follow(blocker, blocked) follow_activity = fetch_latest_follow(blocker, blocked)