aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorsquidboi <squidboi@waifu.club>2018-06-23 14:32:00 -0700
committersquidboi <squidboi@waifu.club>2018-06-23 14:32:00 -0700
commitc4038ede0729e1998511fa0a21860d7061e31454 (patch)
tree4e502cf9215d13a4d68e078fa99126acf214214b /lib
parentf4990283deba2a191e8763a287b5e091fa3c7d05 (diff)
downloadpleroma-c4038ede0729e1998511fa0a21860d7061e31454.tar.gz
fix mind-crushingly dumb syntax error
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex8
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex6
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index a73b0bdf4..c840c8529 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -169,8 +169,8 @@ defmodule Pleroma.User do
end
def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do
- user_config Application.get_env(:pleroma, :user)
- deny_follow_blocked Keyword.get(user_config, :deny_follow_blocked)
+ user_config = Application.get_env(:pleroma, :user)
+ deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
user_info = user_info(followed)
@@ -210,8 +210,8 @@ defmodule Pleroma.User do
end
def follow(%User{} = follower, %User{info: info} = followed) do
- user_config Application.get_env(:pleroma, :user)
- deny_follow_blocked Keyword.get(user_config, :deny_follow_blocked)
+ user_config = Application.get_env(:pleroma, :user)
+ deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
ap_followers = followed.follower_address
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index c9b8961dd..513b53b30 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -243,9 +243,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
def block(blocker, blocked, activity_id \\ nil, local \\ true) do
- ap_config Application.get_env(:pleroma, :activitypub)
- unfollow_blocked Keyword.get(ap_config, :unfollow_blocked)
- outgoing_blocks Keyword.get(ap_config, :outgoing_blocks)
+ ap_config = Application.get_env(:pleroma, :activitypub)
+ unfollow_blocked = Keyword.get(ap_config, :unfollow_blocked)
+ outgoing_blocks = Keyword.get(ap_config, :outgoing_blocks)
with true <- unfollow_blocked do
follow_activity = fetch_latest_follow(blocker, blocked)