Implement listUsers api method and add two functions for getting a list of users

Derkades · Derkades · commit 549f7ec55dc0 · 2019-04-24T14:04:35.000+02:00
diff --git a/src/com/namelessmc/NamelessAPI/NamelessAPI.java b/src/com/namelessmc/NamelessAPI/NamelessAPI.java
@@ -4,7 +4,9 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import com.google.gson.JsonArray;
@@ -157,6 +159,36 @@ public NamelessPlayer getPlayer(UUID uuid) throws NamelessException {
 		return new NamelessPlayer(uuid, apiUrl);
 	}
 	
+	public Map<UUID, String> getRegisteredUsers() throws NamelessException {
+		Request request = new Request(apiUrl, Action.LIST_USERS);
+		request.connect();
+		if (request.hasError()) {
+			throw new ApiError(request.getError());
+		}
+		
+		Map<UUID, String> users = new HashMap<>();
+		
+		request.getResponse().get("users").getAsJsonArray().forEach(userJsonElement -> {
+			final String uuid = userJsonElement.getAsJsonObject().get("uuid").getAsString();
+			final String username = userJsonElement.getAsJsonObject().get("username").getAsString();
+			
+			users.put(websiteUuidToJavaUuid(uuid), username);
+		});
+		
+		return users;
+	}
+	
+	public List<NamelessPlayer> getRegisteredUsersAsNamelessPlayerList() throws NamelessException {
+		Map<UUID, String> users = getRegisteredUsers();
+		List<NamelessPlayer> namelessPlayers = new ArrayList<>();
+		
+		for (UUID userUuid : users.keySet()) {
+			namelessPlayers.add(this.getPlayer(userUuid));
+		}
+		
+		return namelessPlayers;
+	}
+	
 	static String encode(Object object) {
 		try {
 			return URLEncoder.encode(object.toString(), "UTF-8");
@@ -170,6 +202,24 @@ static String[] jsonToArray(JsonArray jsonArray) {
 		jsonArray.iterator().forEachRemaining((element) -> list.add(element.getAsString()));
 		return list.toArray(new String[] {});
 	}
+	
+	static UUID websiteUuidToJavaUuid(String uuid) {
+		// Add dashes to uuid
+		// https://bukkit.org/threads/java-adding-dashes-back-to-minecrafts-uuids.272746/
+		StringBuffer sb = new StringBuffer(uuid);
+		sb.insert(8, "-");
+		 
+		sb = new StringBuffer(sb.toString());
+		sb.insert(13, "-");
+		 
+		sb = new StringBuffer(sb.toString());
+		sb.insert(18, "-");
+		 
+		sb = new StringBuffer(sb.toString());
+		sb.insert(23, "-");
+		 
+		return UUID.fromString(sb.toString());
+	}
 
 
 }
diff --git a/src/com/namelessmc/NamelessAPI/Request.java b/src/com/namelessmc/NamelessAPI/Request.java
@@ -195,6 +195,7 @@ public static enum Action {
 		GET_NOTIFICATIONS("getNotifications", GET),
 		SERVER_INFO("serverInfo", POST),
 		VALIDATE_USER("validateUser", POST),
+		LIST_USERS("listUsers", GET),
 
 		;
 

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ public static enum Action {`
`195`	`195`	`GET_NOTIFICATIONS("getNotifications", GET),`
`196`	`196`	`SERVER_INFO("serverInfo", POST),`
`197`	`197`	`VALIDATE_USER("validateUser", POST),`
	`198`	`+ LIST_USERS("listUsers", GET),`
`198`	`199`
`199`	`200`	`;`
`200`	`201`