From 4c89fb548f433ff3da7c0c82b36cbe353aa55833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90?= <73240868+JustinLiang522@users.noreply.github.com> Date: Sun, 12 Feb 2023 23:02:29 +0800 Subject: [PATCH 1/3] fix issue 3265 --- .../java/run/halo/app/content/impl/PostServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java index 11311a80ab..ad8b6db92b 100644 --- a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java +++ b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java @@ -231,7 +231,13 @@ private Flux listContributors(List usernames) { contributor.setDisplayName(user.getSpec().getDisplayName()); contributor.setAvatar(user.getSpec().getAvatar()); return contributor; - }); + }) + .switchIfEmpty(Mono.fromCallable(() -> { + var contributor = new Contributor(); + contributor.setName("ghost"); + contributor.setDisplayName("Ghost"); + return contributor; + })); } @Override From c42f7be076fda6f3ad9ac8caa776a18081841baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90?= <73240868+JustinLiang522@users.noreply.github.com> Date: Tue, 14 Feb 2023 09:57:58 +0800 Subject: [PATCH 2/3] move ghost to static method --- src/main/java/run/halo/app/content/Contributor.java | 7 +++++++ .../java/run/halo/app/content/impl/PostServiceImpl.java | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/run/halo/app/content/Contributor.java b/src/main/java/run/halo/app/content/Contributor.java index fb86fb4904..20909eea98 100644 --- a/src/main/java/run/halo/app/content/Contributor.java +++ b/src/main/java/run/halo/app/content/Contributor.java @@ -13,4 +13,11 @@ public class Contributor { private String displayName; private String avatar; private String name; + + public static Contributor getGhost() { + Contributor contributor = new Contributor(); + contributor.setName("ghost"); + contributor.setDisplayName("Ghost"); + return contributor; + } } diff --git a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java index ad8b6db92b..377cd48278 100644 --- a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java +++ b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java @@ -232,12 +232,7 @@ private Flux listContributors(List usernames) { contributor.setAvatar(user.getSpec().getAvatar()); return contributor; }) - .switchIfEmpty(Mono.fromCallable(() -> { - var contributor = new Contributor(); - contributor.setName("ghost"); - contributor.setDisplayName("Ghost"); - return contributor; - })); + .defaultIfEmpty(Contributor.getGhost()); } @Override From 5987c1eb869a5af456a04fc6c39d77ba977e0d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90?= <73240868+JustinLiang522@users.noreply.github.com> Date: Tue, 14 Feb 2023 14:26:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=86displayName=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/run/halo/app/content/Contributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/run/halo/app/content/Contributor.java b/src/main/java/run/halo/app/content/Contributor.java index 20909eea98..b9af1e804d 100644 --- a/src/main/java/run/halo/app/content/Contributor.java +++ b/src/main/java/run/halo/app/content/Contributor.java @@ -17,7 +17,7 @@ public class Contributor { public static Contributor getGhost() { Contributor contributor = new Contributor(); contributor.setName("ghost"); - contributor.setDisplayName("Ghost"); + contributor.setDisplayName("已删除用户"); return contributor; } }