Fix member getDisplayName returning incorrect value

if user was migrated and no nickname was set
Discord4J · Jun 25, 2023 · 1a8e6ae · 1a8e6ae
1 parent fa81c5b
commit 1a8e6ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/src/main/java/discord4j/core/object/entity/PartialMember.java b/core/src/main/java/discord4j/core/object/entity/PartialMember.java
@@ -236,7 +236,7 @@ public Mono<Guild> getGuild(EntityRetrievalStrategy retrievalStrategy) {
      * @return The name that is displayed in client.
      */
     public String getDisplayName() {
-        return getNickname().orElse(getUsername());
+        return getNickname().orElseGet(() -> getGlobalName().orElse(getUsername()));
     }
 
     /**

diff --git a/core/src/test/java/discord4j/core/ExampleInteractions.java b/core/src/test/java/discord4j/core/ExampleInteractions.java
@@ -90,11 +90,16 @@ public static void main(String[] args) {
                     Publisher<?> onUser = client.on(UserInteractionEvent.class, event -> {
                         if (USER_COMMAND_NAME.equals(event.getCommandName())) {
                             return event.getTargetUser()
+                                    .flatMap(u -> u.asMember(event.getInteraction().getGuildId().orElseThrow(RuntimeException::new)))
                                     .flatMap(user -> event.reply()
                                             .withEmbeds(EmbedCreateSpec.create()
                                                     .withFields(
                                                             EmbedCreateFields.Field.of("Name", user.getUsername(),
                                                                     false),
+                                                            EmbedCreateFields.Field.of("Display Name", user.getDisplayName(),
+                                                                    false),
+                                                            EmbedCreateFields.Field.of("Global Name", user.getGlobalName().orElse("none"),
+                                                                    false),
                                                             EmbedCreateFields.Field.of("Avatar URL",
                                                                     user.getAvatarUrl(), false))
                                                     .withImage(user.getAvatarUrl())));