diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-07 16:42:05 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-07 16:42:05 +0000 |
| commit | 2a9191a53eda9a2e1b067774804db54fc3eda5d0 (patch) | |
| tree | e3e9f31eb7b8032995a37e171e86baaa03c57696 /lib | |
| parent | 8e9f6d8f6954f3eb3f3b4b371ae9e886d88e2f0d (diff) | |
| parent | 3c5926fe913287ee00a0efb93d2a8ecbddfd26c7 (diff) | |
| download | pleroma-2a9191a53eda9a2e1b067774804db54fc3eda5d0.tar.gz | |
Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'
MRF: anti followbot: gracefully handle nil display names
See merge request pleroma/pleroma!909
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex index 7c6ad582a..34665a3a6 100644 --- a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex @@ -23,15 +23,21 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy do 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 = - displayname - |> String.downcase() - |> score_displayname() + if is_binary(displayname) do + displayname + |> String.downcase() + |> score_displayname() + else + 0.0 + end nick_score + name_score end |