user: Remove verbose name expression in mention

yona-projects · Aug 11, 2017 · 0296a9d · 0296a9d
1 parent 1899347
commit 0296a9d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/models/User.java b/app/models/User.java
@@ -991,4 +991,16 @@ public int compare(Project lhs, Project rhs) {
     public boolean isLocked() {
         return this.state == UserState.LOCKED || this.state == UserState.DELETED;
     }
+
+    public String getPureNameOnly(){
+        String pureName = this.name;
+        String [] spliters = { "[", "(" };
+        for(String spliter: spliters) {
+            if(pureName.contains(spliter)){
+                pureName = this.name.substring(0, this.name.indexOf(spliter));
+            }
+        }
+
+        return pureName;
+    }
 }
diff --git a/app/utils/AutoLinkRenderer.java b/app/utils/AutoLinkRenderer.java
@@ -328,9 +328,9 @@ private static Link toValidUserLink(String userId) {
             if( user.avatarUrl().equals(UserApp.DEFAULT_AVATAR_URL) ){
                 avatarImage = "";
             } else {
-                avatarImage = "<img src='" + user.avatarUrl() + "' class='avatar-wrap smaller no-margin-no-padding vertical-top' alt='@" + user.loginId + "'> ";
+                avatarImage = "<img src='" + user.avatarUrl() + "' class='avatar-wrap smaller no-margin-no-padding vertical-top' alt='@" + user.name + " " + user.loginId + "'> ";
             }
-            return new Link(RouteUtil.getUrl(user), "no-text-decoration", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.loginId) + "\">@" + user.name + "</span>");
+            return new Link(RouteUtil.getUrl(user), "no-text-decoration", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.name + " " + user.loginId) + "\">@" + user.getPureNameOnly() + "</span>");
         }
     }