From fb7b926be385da563f29f2a7134f965fcba36b3c Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 17 Feb 2018 18:15:48 +0100 Subject: Handle black name fields on incoming users. --- lib/pleroma/user.ex | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib') 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 -- cgit v1.2.3