Http Encoding for ^

Author: dec4234

src/main/java/material/DestinyAPI.java

@@ -17,6 +17,7 @@
 import material.user.UserCredential;
 import material.user.UserCredentialType;
 import utils.HttpUtils;
+import utils.StringUtils;
 import utils.framework.OAuthManager;
 
 import java.util.ArrayList;
@@ -157,7 +158,6 @@ public static UserCredential[] getUserCredentials(BungieUser bungieUser) {
 
 	/**
 	 * Get a "UserCredential" from a BungieUser
-	 *
 	 */
 	public static UserCredential getUserCredential(UserCredentialType type, BungieUser bungieUser) {
 		for(UserCredential userCredential : getUserCredentials(bungieUser)) {
@@ -182,15 +182,15 @@ public static List<BungieUser> getUsersWithName(String name) {
 		List<BungieUser> temp = new ArrayList<>();
 		List<String> ids = new ArrayList<>();
 
-		// encode characters              space                      hashtag
-		name = name.replace(" ", "%20").replace("#", "%23");
+		// encode characters
+		name = StringUtils.httpEncode(name);
 
 		try {
 			JsonObject obj = hu.urlRequestGET("https://www.bungie.net/platform/Destiny2/SearchDestinyPlayer/-1/" + name + "/?components=204");
-			JsonArray ja = obj.getAsJsonArray("Response");
+			JsonArray jsonArray = obj.getAsJsonArray("Response");
 
-			for (JsonElement je : ja) {
-				JsonObject us = je.getAsJsonObject();
+			for (JsonElement jsonElement : jsonArray) {
+				JsonObject us = jsonElement.getAsJsonObject();
 				BungieUser bu = new BungieUser(us.get("membershipId").getAsString(), DestinyPlatform.fromMembershipType(us.get("membershipType").getAsInt()));
 				if (!ids.contains(bu.getBungieMembershipID())) {
 					temp.add(bu);
@@ -220,6 +220,8 @@ public static List<BungieUser> getValidUsers(String name) {
 	 * while for this you can search with "dec4234"
 	 */
 	public static List<BungieUser> searchGlobalDisplayNames(String prefix) {
+		prefix = StringUtils.httpEncode(prefix);
+
 		List<BungieUser> bungieUsers = new ArrayList<>();
 
 		JsonArray jsonArray = new HttpUtils().urlRequestGET("https://www.bungie.net/Platform/User/Search/Prefix/" + prefix + "/0/").getAsJsonObject("Response").getAsJsonArray("searchResults");

src/main/java/material/user/UserCredential.java

@@ -8,6 +8,11 @@
 
 package material.user;
 
+/**
+ * A "UserCredential" is a linked Platform to a Bungie Account
+ *
+ * Such as a twitch account
+ */
 public class UserCredential {
 
 	private UserCredentialType userCredentialType;

src/main/java/utils/HttpUtils.java

@@ -8,20 +8,19 @@
 
 package utils;
 
-import com.google.gson.*;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import exceptions.APIOfflineException;
 import exceptions.AccessTokenInvalidException;
 import material.DestinyAPI;
 import material.manifest.ManifestEntityTypes;
 
-import java.net.ConnectException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
 import java.util.Base64;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -30,7 +29,7 @@
  */
 public class HttpUtils {
 
-	String apiKey = DestinyAPI.getApiKey();
+	private String apiKey = DestinyAPI.getApiKey();
 	private static String bearerToken;
 
 	/**

src/main/java/utils/StringUtils.java

@@ -24,7 +24,7 @@ public class StringUtils {
 	 */
 	public static Date valueOfZTime(String zuluTimeInString) {
 		String temp = zuluTimeInString;
-		if(temp.length() == 24) {
+		if(temp.length() == 24) { // Sometimes the date will be in an extra precise format, which is truncated here
 			temp = temp.substring(0, temp.length() - 5);
 			temp = temp + "Z";
 		}
@@ -38,8 +38,20 @@ public static Date valueOfZTime(String zuluTimeInString) {
 		return null;
 	}
 
+	/**
+	 * Get the number of days since the time date provided
+	 */
 	public static double getDaysSinceTime(Date date) {
 		DecimalFormat df = new DecimalFormat("0.##");
 		return Double.parseDouble(df.format((new Date().getTime() - date.getTime()) / 1000.0 / 60.0 / 60.0 / 24.0));
 	}
+
+	/**
+	 * Encode a string to be suitable for use in a url
+	 *
+	 * Specific characters need to be encoded in order to have a successful request
+	 */
+	public static String httpEncode(String input) {
+		return input.replace(" ", "%20").replace("#", "%23").replace("^", "%5E");
+	}
 }