Skip to content

Commit 874ddb9

Browse files
committed
Spigot: Support primary groups formatting
1 parent e938745 commit 874ddb9

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

API/src/main/java/me/innectic/permissify/api/util/ChatFormatter.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import me.innectic.permissify.api.permission.PermissionGroup;
66

77
import java.util.List;
8+
import java.util.Optional;
89
import java.util.UUID;
910

1011
/**
@@ -26,10 +27,10 @@ public static String formatChat(UUID uuid, String username, String message) {
2627
if (!PermissifyAPI.get().get().getDatabaseHandler().isPresent()) return username + ": " + message;
2728
DatabaseHandler handler = PermissifyAPI.get().get().getDatabaseHandler().get();
2829

29-
// TODO: Do something about primary groups that would be the "display" group
30-
List<PermissionGroup> group = handler.getGroups(uuid);
30+
Optional<PermissionGroup> group = handler.getPrimaryGroup(uuid);
31+
if (!group.isPresent()) return username + ": " + message;
3132
String formatter = handler.getChatFormat(false);
32-
return formatter.replace("{group}", group.get(0).getName())
33+
return formatter.replace("{group}", group.get().getName())
3334
.replace("{username}", username).replace("{message}", message);
3435
}
3536

@@ -48,12 +49,13 @@ public static String formatWhisper(UUID senderUuid, String senderName, UUID rece
4849
if (!PermissifyAPI.get().get().getDatabaseHandler().isPresent()) return senderName + " > " + receiverName + ": " + message;
4950
DatabaseHandler handler = PermissifyAPI.get().get().getDatabaseHandler().get();
5051

51-
// TODO: Do something about primary groups that would be the "display" group
52-
List<PermissionGroup> senderGroups = handler.getGroups(senderUuid);
53-
List<PermissionGroup> receiverGroups = handler.getGroups(receiverUuid);
52+
Optional<PermissionGroup> senderGroup = handler.getPrimaryGroup(senderUuid);
53+
if (!senderGroup.isPresent()) return senderName + " > " + receiverName + ": " + message;
54+
Optional<PermissionGroup> receiverGroup = handler.getPrimaryGroup(senderUuid);
55+
if (!receiverGroup.isPresent()) return senderName + " > " + receiverName + ": " + message;
5456
String formatter = handler.getWhisperFormat(false);
55-
return formatter.replace("{senderGroup}", senderGroups.get(0).getName())
57+
return formatter.replace("{senderGroup}", senderGroup.get().getName())
5658
.replace("{username}", senderName).replace("{message}", message)
57-
.replace("{to}", receiverName).replace("{receiverGroup}", receiverGroups.get(0).getName());
59+
.replace("{to}", receiverName).replace("{receiverGroup}", receiverGroup.get().getName());
5860
}
5961
}

0 commit comments

Comments
 (0)