From: rinpatch <rinpatch@sdf.org>
Date: Thu, 16 Apr 2020 14:54:57 +0000 (+0300)
Subject: user: remove blank?
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=77ee64b9930bf6b439f87112fa35e302f5125aa2;p=akkoma

user: remove blank?
---

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index fab405233..753b0c686 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -343,9 +343,15 @@ defmodule Pleroma.User do
     bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000)
     name_limit = Pleroma.Config.get([:instance, :user_name_length], 100)
 
+    name =
+      case params[:name] do
+        name when is_binary(name) and byte_size(name) > 0 -> name
+        _ -> params[:nickname]
+      end
+
     params =
       params
-      |> Map.put(:name, blank?(params[:name]) || params[:nickname])
+      |> Map.put(:name, name)
       |> Map.put_new(:last_refreshed_at, NaiveDateTime.utc_now())
       |> truncate_if_exists(:name, name_limit)
       |> truncate_if_exists(:bio, bio_limit)
@@ -1599,9 +1605,6 @@ defmodule Pleroma.User do
     end
   end
 
-  defp blank?(""), do: nil
-  defp blank?(n), do: n
-
   def ap_enabled?(%User{local: true}), do: true
   def ap_enabled?(%User{ap_enabled: ap_enabled}), do: ap_enabled
   def ap_enabled?(_), do: false