diff --git a/src/main/java/org/b3log/symphony/event/CommentNotifier.java b/src/main/java/org/b3log/symphony/event/CommentNotifier.java index 7fd7fcdd..76fbdfd1 100644 --- a/src/main/java/org/b3log/symphony/event/CommentNotifier.java +++ b/src/main/java/org/b3log/symphony/event/CommentNotifier.java @@ -155,6 +155,7 @@ public void action(final Event event) { commenter = userQueryService.getAnonymousUser(); } final String commenterName = commenter.optString(User.USER_NAME); + final String commenterNickName = commenter.optString(UserExt.USER_NICKNAME); // 0. Data channel (WebSocket) final JSONObject chData = JSONs.clone(originalComment); @@ -203,6 +204,7 @@ public void action(final Event event) { chData.put(Comment.COMMENT_T_AUTHOR_NAME, commenterName); + chData.put("commentAuthorNickName", commenterNickName); chData.put(Comment.COMMENT_T_AUTHOR_THUMBNAIL_URL, avatarQueryService.getAvatarURLByUser(commenter, "48")); diff --git a/src/main/java/org/b3log/symphony/processor/ArticleProcessor.java b/src/main/java/org/b3log/symphony/processor/ArticleProcessor.java index 3c6455bd..54f5e90b 100644 --- a/src/main/java/org/b3log/symphony/processor/ArticleProcessor.java +++ b/src/main/java/org/b3log/symphony/processor/ArticleProcessor.java @@ -305,6 +305,7 @@ public void showArticleApi(final RequestContext context) { article.put(Article.ARTICLE_T_AUTHOR_NAME, author.optString(User.USER_NAME)); article.put(Article.ARTICLE_T_AUTHOR_URL, author.optString(User.USER_URL)); article.put(Article.ARTICLE_T_AUTHOR_INTRO, author.optString(UserExt.USER_INTRO)); + article.put("articleAuthorNickName", author.optString(UserExt.USER_NICKNAME)); String metal = cloudService.getEnabledMetal(articleAuthorId); if (!metal.equals("{}")) { @@ -1059,6 +1060,7 @@ public void showArticle(final RequestContext context) { article.put(Article.ARTICLE_T_AUTHOR_NAME, author.optString(User.USER_NAME)); article.put(Article.ARTICLE_T_AUTHOR_URL, author.optString(User.USER_URL)); article.put(Article.ARTICLE_T_AUTHOR_INTRO, author.optString(UserExt.USER_INTRO)); + article.put("articleAuthorNickName", author.optString(UserExt.USER_NICKNAME)); String metal = cloudService.getEnabledMetal(articleAuthorId); if (!metal.equals("{}")&&Article.ARTICLE_ANONYMOUS_C_ANONYMOUS!=article.optInt(Article.ARTICLE_ANONYMOUS)) { diff --git a/src/main/java/org/b3log/symphony/service/CommentQueryService.java b/src/main/java/org/b3log/symphony/service/CommentQueryService.java index 6260e2c1..979628fa 100644 --- a/src/main/java/org/b3log/symphony/service/CommentQueryService.java +++ b/src/main/java/org/b3log/symphony/service/CommentQueryService.java @@ -867,6 +867,7 @@ private void organizeComment(final JSONObject comment) throws RepositoryExceptio } comment.put(Comment.COMMENT_T_COMMENTER, author); comment.put(Comment.COMMENT_T_AUTHOR_NAME, author.optString(User.USER_NAME)); + comment.put("commentAuthorNickName", author.optString(UserExt.USER_NICKNAME)); comment.put(Comment.COMMENT_T_AUTHOR_URL, author.optString(User.USER_URL)); final String thumbnailURL = avatarQueryService.getAvatarURLByUser(author, "48"); comment.put(Comment.COMMENT_T_AUTHOR_THUMBNAIL_URL, thumbnailURL); diff --git a/src/main/resources/skins/classic/article.ftl b/src/main/resources/skins/classic/article.ftl index 2a0bf987..265ea10b 100644 --- a/src/main/resources/skins/classic/article.ftl +++ b/src/main/resources/skins/classic/article.ftl @@ -191,7 +191,7 @@ ${comment.commentAuthorName} + class="ft-gray"><#if comment.commentAuthorNickName != "">${comment.commentAuthorNickName} (${comment.commentAuthorName})<#else>${comment.commentAuthorName} • ${comment.timeAgo} <#if comment.rewardedCnt gt 0> diff --git a/src/main/resources/skins/classic/common/comment.ftl b/src/main/resources/skins/classic/common/comment.ftl index 235eb801..7163d451 100644 --- a/src/main/resources/skins/classic/common/comment.ftl +++ b/src/main/resources/skins/classic/common/comment.ftl @@ -31,7 +31,7 @@
- ${comment.commentAuthorName} + <#if comment.commentAuthorNickName != "">${comment.commentAuthorNickName} (${comment.commentAuthorName})<#else>${comment.commentAuthorName} <#list comment.sysMetal?eval as metal> diff --git a/src/main/resources/skins/mobile/article.ftl b/src/main/resources/skins/mobile/article.ftl index 116bd064..b9a7fce1 100644 --- a/src/main/resources/skins/mobile/article.ftl +++ b/src/main/resources/skins/mobile/article.ftl @@ -121,7 +121,7 @@ title="${article.articleAuthorName}">
+ title="${article.articleAuthorName}"><#if article.articleAuthorNickName != "">${article.articleAuthorNickName}<#else>${article.articleAuthorName} <#if article.articleCity != "">  •  @@ -270,7 +270,7 @@
- ${comment.commentAuthorName} + <#if comment.commentAuthorNickName != "">${comment.commentAuthorNickName} (${comment.commentAuthorName})<#else>${comment.commentAuthorName} • ${comment.timeAgo} <#if comment.rewardedCnt gt 0> diff --git a/src/main/resources/skins/mobile/common/comment.ftl b/src/main/resources/skins/mobile/common/comment.ftl index aa2366ae..6cf78c7c 100644 --- a/src/main/resources/skins/mobile/common/comment.ftl +++ b/src/main/resources/skins/mobile/common/comment.ftl @@ -31,7 +31,7 @@