Commit 2a9191a5 authored by rinpatch's avatar rinpatch
Browse files

Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'

MRF: anti followbot: gracefully handle nil display names

See merge request pleroma/pleroma!909
parents 8e9f6d8f 3c5926fe
Pipeline #8689 passed with stages
in 3 minutes and 30 seconds
......@@ -23,15 +23,21 @@ defp score_displayname("fedibot"), do: 1.0
defp score_displayname(_), do: 0.0
defp determine_if_followbot(%User{nickname: nickname, name: displayname}) do
# nickname will always be a binary string because it's generated by Pleroma.
nick_score =
nickname
|> String.downcase()
|> score_nickname()
# displayname will either be a binary string or nil, if a displayname isn't set.
name_score =
if is_binary(displayname) do
displayname
|> String.downcase()
|> score_displayname()
else
0.0
end
nick_score + name_score
end
......
......@@ -54,4 +54,19 @@ test "it allows non-followbots" do
{:ok, _} = AntiFollowbotPolicy.filter(message)
end
test "it gracefully handles nil display names" do
actor = insert(:user, %{name: nil})
target = insert(:user)
message = %{
"@context" => "https://www.w3.org/ns/activitystreams",
"type" => "Follow",
"actor" => actor.ap_id,
"object" => target.ap_id,
"id" => "https://example.com/activities/1234"
}
{:ok, _} = AntiFollowbotPolicy.filter(message)
end
end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment