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

Remove Task.async as it is broken here and probably a premature optimization anyway

This commit is contained in:
Mark Felder 2021-02-19 18:36:35 -06:00
parent f73d166785
commit 4796df0bc3
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/web/activity_pub/mrf/followbot_policy.ex
View File

@ -1,6 +1,5 @@
defmodule Pleroma.Web.ActivityPub.MRF.FollowbotPolicy do defmodule Pleroma.Web.ActivityPub.MRF.FollowbotPolicy do
@behaviour Pleroma.Web.ActivityPub.MRF @behaviour Pleroma.Web.ActivityPub.MRF
alias Pleroma.Activity
alias Pleroma.Config alias Pleroma.Config
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
@ -29,7 +28,6 @@ def filter(message) do
end end
defp try_follow(follower, message) do defp try_follow(follower, message) do
Task.start(fn ->
to = Map.get(message, "to", []) to = Map.get(message, "to", [])
cc = Map.get(message, "cc", []) cc = Map.get(message, "cc", [])
actor = [message["actor"]] actor = [message["actor"]]
@ -39,22 +37,17 @@ defp try_follow(follower, message) do
|> Enum.uniq() |> Enum.uniq()
|> User.get_all_by_ap_id() |> User.get_all_by_ap_id()
|> Enum.each(fn user -> |> Enum.each(fn user ->
since_thirty_days_ago = NaiveDateTime.utc_now() |> NaiveDateTime.add(-(86_400 * 30))
with false <- user.local, with false <- user.local,
false <- User.following?(follower, user), false <- User.following?(follower, user),
false <- User.locked?(user), false <- User.locked?(user),
false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot"), false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
false <- Logger.debug(
Activity.follow_requests_outstanding_since?(follower, user, since_thirty_days_ago) do
Logger.info(
"#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}" "#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}"
) )
CommonAPI.follow(follower, user) CommonAPI.follow(follower, user)
end end
end) end)
end)
{:ok, message} {:ok, message}
end end