From 5784458d03d3a9ddb2953a20074a6344e23dc033 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Thu, 3 Aug 2017 18:39:39 +0100
Subject: [PATCH] Make Sponge's #getFriendlyIdentifier return usernames of
 Users and display names of Groups (#412)

---
 .../luckperms/sponge/service/proxy/api7/SubjectProxy.java    | 5 +++++
 .../java/me/lucko/luckperms/sponge/model/SpongeGroup.java    | 3 ++-
 .../java/me/lucko/luckperms/sponge/model/SpongeUser.java     | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java
index 3e4eb76a9..5a3b4f9f8 100644
--- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java
+++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java
@@ -153,6 +153,11 @@ public class SubjectProxy implements Subject {
         return ref.getSubjectIdentifier();
     }
 
+    @Override
+    public Optional<String> getFriendlyIdentifier() {
+        return getHandle().thenApply(LPSubject::getFriendlyIdentifier).join();
+    }
+
     @Override
     public Set<Context> getActiveContexts() {
         return getHandle().thenApply(handle -> CompatibilityUtil.convertContexts(handle.getActiveContextSet())).join();
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java
index e6a2a86cb..9a5e1b7de 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java
@@ -150,7 +150,8 @@ public class SpongeGroup extends Group {
 
         @Override
         public Optional<String> getFriendlyIdentifier() {
-            return Optional.of(parent.getFriendlyName());
+            String rawDisplayName = parent.getRawDisplayName();
+            return rawDisplayName.equals(getIdentifier()) ? Optional.empty() : Optional.of(rawDisplayName);
         }
 
         @Override
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java
index e55c7aa98..a6ed78f85 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java
@@ -94,6 +94,11 @@ public class SpongeUser extends User {
             return plugin.getUuidCache().getExternalUUID(parent.getUuid()).toString();
         }
 
+        @Override
+        public Optional<String> getFriendlyIdentifier() {
+            return parent.getName();
+        }
+
         @Override
         public Optional<CommandSource> getCommandSource() {
             final UUID uuid = plugin.getUuidCache().getExternalUUID(parent.getUuid());