aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-02-17 18:15:48 +0100
committerlain <lain@soykaf.club>2018-02-17 18:15:48 +0100
commitfb7b926be385da563f29f2a7134f965fcba36b3c (patch)
tree1c6dbbfd8c3a411ceb0a43d2dd3d30392d66f21d /lib
parentc2d0cb1a295c46ebb425405a2b38c1c2fe3e6ae1 (diff)
downloadpleroma-fb7b926be385da563f29f2a7134f965fcba36b3c.tar.gz
Handle black name fields on incoming users.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 61bca3afd..ab29fe6f4 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -417,7 +417,12 @@ defmodule Pleroma.User do
end
end
+ defp blank?(""), do: nil
+ defp blank?(n), do: n
+
def insert_or_update_user(data) do
+ data = data
+ |> Map.put(:name, blank?(data[:name]) || data[:nickname])
cs = User.remote_user_creation(data)
Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
end