change moved attributes into normal variables

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 6000e74fc0af03ce90ed0957655354695b4f74ef..a73b0bdf46eaf90382bf90dbb26ef76383563cf8 100644 (file)
--- 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)
 
@@ -181,7 +181,7 @@ defmodule Pleroma.User do
           false
 
         # if the users are blocking each other, we shouldn't even be here, but check for it anyway
-        @deny_follow_blocked and
+        deny_follow_blocked and
             (User.blocks?(follower, followed) or User.blocks?(followed, follower)) ->
           false
 
@@ -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
 
@@ -219,7 +219,7 @@ defmodule Pleroma.User do
       following?(follower, followed) or info["deactivated"] ->
         {:error, "Could not follow user: #{followed.nickname} is already on your list."}
 
-      @deny_follow_blocked and blocks?(followed, follower) ->
+      deny_follow_blocked and blocks?(followed, follower) ->
         {:error, "Could not follow user: #{followed.nickname} blocked you."}
 
       true ->

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index b76edbd8b9f4d2f2eaa30c5a15857657ded48335..c9b8961dd9545b37fe9a7060d9d7d09079c9efd0 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -243,11 +243,11 @@ 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
+    with true <- unfollow_blocked do
       follow_activity = fetch_latest_follow(blocker, blocked)
 
       if follow_activity do
@@ -255,7 +255,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       end
     end
 
-    with true <- @outgoing_blocks do
+    with true <- outgoing_blocks do
       with block_data <- make_block_data(blocker, blocked, activity_id),
            {:ok, activity} <- insert(block_data, local),
            :ok <- maybe_federate(activity) do