From b3981ddc43a3ea1ae262ac63ed344d478b14f710 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 17 May 2018 16:34:16 +0800 Subject: [PATCH] Shorten `User.suggest_name` further. --- app/models/user.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 568886d418d..1621ddee87f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -288,9 +288,7 @@ class User < ActiveRecord::Base def self.suggest_name(string) return "" if string.blank? - local_part = string[/\A[^@]+/] - suggestion = local_part.present? ? local_part : string[/[^@]+\z/] - suggestion.tr(".", " ").titleize + (string[/\A[^@]+/].presence || string[/[^@]+\z/]).tr(".", " ").titleize end def self.find_by_username_or_email(username_or_email)