fix crash when unauthenticated

thanks to WindVertex for finding this
- tweak image sharing

Author: moehreag

1.16_combat-6/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageShare.java

@@ -58,7 +58,7 @@ public void uploadImage(File file) {
 
 	public ImageInstance downloadImage(String url) {
 		ImageData data = download(url);
-		if (!data.name().isEmpty()) {
+		if (data != ImageData.EMPTY) {
 			try {
 				return new ImageInstance(NativeImage.read(new ByteArrayInputStream(data.data())), data.name());
 			} catch (IOException ignored) {

1.20/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageShare.java

@@ -61,7 +61,7 @@ public void uploadImage(File file) {
 
 	public ImageInstance downloadImage(String url) {
 		ImageData data = download(url);
-		if (!data.name().isEmpty()) {
+		if (data != ImageData.EMPTY) {
 			try {
 				return new ImageInstance(NativeImage.read(new ByteArrayInputStream(data.data())), data.name());
 			} catch (IOException ignored) {

1.21.4/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageShare.java

@@ -60,7 +60,7 @@ public void uploadImage(File file) {
 
 	public ImageInstance downloadImage(String url) {
 		ImageData data = download(url);
-		if (!data.name().isEmpty()) {
+		if (data != ImageData.EMPTY) {
 			try {
 				return new ImageInstance(NativeImage.read(new ByteArrayInputStream(data.data())), data.name());
 			} catch (IOException ignored) {

1.21/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageShare.java

@@ -61,7 +61,7 @@ public void uploadImage(File file) {
 
 	public ImageInstance downloadImage(String url) {
 		ImageData data = download(url);
-		if (!data.name().isEmpty()) {
+		if (data != ImageData.EMPTY) {
 			try {
 				return new ImageInstance(NativeImage.read(new ByteArrayInputStream(data.data())), data.name());
 			} catch (IOException ignored) {

1.8.9/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageShare.java

@@ -67,7 +67,7 @@ public void doAction() {
 
 	public ImageInstance downloadImage(String url) {
 		ImageData data = download(url);
-		if (!data.name().isEmpty()) {
+		if (data != ImageData.EMPTY) {
 			try {
 				return new ImageInstance(ImageIO.read(new ByteArrayInputStream(data.data())), data.name());
 			} catch (IOException ignored) {

common/src/main/java/io/github/axolotlclient/api/API.java

@@ -195,6 +195,9 @@ public CompletableFuture<Response> delete(Request request) {
 	}
 
 	private CompletableFuture<Response> request(Request request, String method) {
+		if (!getApiOptions().enabled.get()) {
+			return CompletableFuture.completedFuture(Response.builder().status(0).body("{\"description\":\"Integration disabled!\"}").build());
+		}
 		if (!getApiOptions().privacyAccepted.get().isAccepted()) {
 			return CompletableFuture.completedFuture(Response.CLIENT_ERROR);
 		}
@@ -208,9 +211,6 @@ private CompletableFuture<Response> request(Request request, String method) {
 
 	private CompletableFuture<Response> request(URI url, Map<String, ?> payload, byte[] rawBody, String method, Map<String, String> headers) {
 		return CompletableFuture.supplyAsync(() -> {
-			if (!getApiOptions().enabled.get()) {
-				return Response.builder().status(0).body("{\"description\":\"Integration disabled!\"}").build();
-			}
 			try {
 				logDetailed("Starting request to " + method + " " + url);
 

common/src/main/java/io/github/axolotlclient/api/requests/UserRequest.java

@@ -50,7 +50,7 @@ public class UserRequest {
 
 	public static boolean getOnline(String uuid) {
 
-		if (uuid == null) {
+		if (uuid == null || !API.getInstance().isAuthenticated()) {
 			return false;
 		}
 

common/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageNetworking.java

@@ -29,6 +29,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import io.github.axolotlclient.api.API;
+import io.github.axolotlclient.api.Constants;
 import io.github.axolotlclient.api.Request;
 
 public abstract class ImageNetworking {
@@ -51,6 +52,9 @@ protected CompletableFuture<String> upload(String name, byte[] data) {
 	}
 
 	protected ImageData download(String url) {
+		if (url.contains("/") && !url.startsWith(Constants.API_URL)) {
+			return ImageData.EMPTY;
+		}
 		if (url.endsWith("/raw")) {
 			url = url.substring(0, url.length() - 4);
 		}
@@ -68,6 +72,5 @@ protected ImageData download(String url) {
 
 	public record ImageData(String name, byte[] data) {
 		public static final ImageData EMPTY = new ImageData("", new byte[0]);
-
 	}
 }

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.0-beta.36
+version=3.1.0-beta.37
 
 maven_group=io.github.axolotlclient