Release v1.2.7

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.rappytv.globaltags</groupId>
     <artifactId>GlobalTagsJava</artifactId>
-    <version>1.2.6</version>
+    <version>1.2.7</version>
 
     <name>GlobalTagsJava</name>
     <description>A wrapper for the GlobalTagsAPI</description>

src/main/java/com/rappytv/globaltags/wrapper/GlobalTagsAPI.java

@@ -16,6 +16,9 @@
  */
 public abstract class GlobalTagsAPI<T> {
 
+    /*+
+     * Default urls
+     */
     private final Urls urls = new Urls();
     /**
      * Default cache options
@@ -229,7 +232,8 @@ public String getRoleIcon(String role) {
         @NotNull
         public String getCustomIcon(UUID uuid, String hash) {
             return String.format(
-                    "https://api.globaltags.xyz/players/%s/icon/%s",
+                    "%s/players/%s/icon/%s",
+                    this.getApiBase(),
                     uuid,
                     hash
             );

src/main/java/com/rappytv/globaltags/wrapper/enums/GlobalIcon.java

@@ -9,18 +9,26 @@ public enum GlobalIcon {
     ANDROID,
     APPLE,
     BEREAL,
+    CASHAPP,
     CROWN,
     DISCORD,
     DUOLINGO,
     EBIO,
     EPICGAMES,
+    FACEBOOK,
     GAMESCOM,
     GITHUB,
     GITLAB,
+    GLOBALTAGS,
     HEART,
     INSTAGRAM,
     KICK,
+    LABYMOD,
     LABYNET,
+    LINKEDIN,
+    NAMEMC,
+    MASTODON,
+    PATREON,
     PAYPAL,
     PINTEREST,
     PLAYSTATION,
@@ -32,9 +40,12 @@ public enum GlobalIcon {
     STATSFM,
     STEAM,
     TELEGRAM,
+    TELLONYM,
     THREADS,
     TIKTOK,
     TWITCH,
+    VENMO,
+    WECHAT,
     X,
     XBOX,
     YOUTUBE

src/main/java/com/rappytv/globaltags/wrapper/http/ApiHandler.java

@@ -10,6 +10,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
 
@@ -226,7 +229,7 @@ public void setTag(@NotNull UUID uuid, @NotNull String tag, @NotNull Consumer<Ap
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -266,7 +269,7 @@ public void setPosition(@NotNull UUID uuid, @NotNull GlobalPosition position, @N
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -306,7 +309,47 @@ public void setIcon(@NotNull UUID uuid, @NotNull GlobalIcon icon, @NotNull Consu
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
+            );
+        });
+    }
+
+    /**
+     * A request to upload a custom icon for a specific uuid
+     *
+     * @param uuid     The uuid you want to upload the icon for
+     * @param file     The image file you want to upload
+     * @param consumer The action to be executed on response.
+     */
+    public void uploadIcon(@NotNull UUID uuid, @NotNull File file, @NotNull Consumer<ApiResponse<IconUploadSchema>> consumer) throws IOException {
+        Objects.requireNonNull(file);
+        this.uploadIcon(uuid, file.toPath(), consumer);
+    }
+
+    /**
+     * A request to upload a custom icon for a specific uuid
+     *
+     * @param uuid     The uuid you want to upload the icon for
+     * @param path     The image file path you want to upload
+     * @param consumer The action to be executed on response.
+     */
+    public void uploadIcon(@NotNull UUID uuid, @NotNull Path path, @NotNull Consumer<ApiResponse<IconUploadSchema>> consumer) throws IOException {
+        Objects.requireNonNull(uuid);
+        Objects.requireNonNull(path);
+        Objects.requireNonNull(consumer);
+        new ApiRequest<>(
+                this.api,
+                "POST",
+                Routes.uploadIcon(uuid),
+                MultipartData.newBuilder().addFile("image", path, "image/png").build(),
+                IconUploadSchema.class
+        ).sendRequestAsync((response) -> {
+            if (!response.isSuccessful()) {
+                consumer.accept(new ApiResponse<>(false, null, response.getError()));
+                return;
+            }
+            this.api.getCache().renew(uuid, (info) ->
+                    consumer.accept(new ApiResponse<>(true, response.getData(), null))
             );
         });
     }
@@ -344,7 +387,7 @@ public void setRoleIconVisibility(@NotNull UUID uuid, boolean visible, @NotNull
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -380,7 +423,7 @@ public void resetTag(@NotNull UUID uuid, @NotNull Consumer<ApiResponse<String>>
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -429,7 +472,7 @@ public void updateWatchlistStatus(@NotNull UUID uuid, boolean watched, @NotNull
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -557,7 +600,7 @@ public void deleteApiKey(@NotNull UUID uuid, @NotNull String name, @NotNull Cons
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -731,7 +774,7 @@ public void deleteGiftCode(@NotNull String code, @NotNull Consumer<ApiResponse<S
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -755,7 +798,7 @@ public void referPlayer(@NotNull UUID uuid, @NotNull Consumer<ApiResponse<String
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -781,7 +824,7 @@ public void reportPlayer(@NotNull UUID uuid, @NotNull String reason, @NotNull Co
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -918,7 +961,7 @@ public void banPlayer(@NotNull UUID uuid, @NotNull String reason, @Nullable Bool
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -944,7 +987,7 @@ public void unbanPlayer(@NotNull UUID uuid, @NotNull Consumer<ApiResponse<String
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -973,7 +1016,7 @@ public void editBan(@NotNull UUID uuid, @NotNull String reason, boolean appealab
                 return;
             }
             this.api.getCache().renew(uuid, (info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -998,7 +1041,7 @@ public void appealBan(@NotNull String reason, @NotNull Consumer<ApiResponse<Stri
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -1043,7 +1086,7 @@ public void unlinkDiscord(@NotNull Consumer<ApiResponse<String>> consumer) {
                 return;
             }
             this.api.getCache().renewSelf((info) ->
-                    consumer.accept(new ApiResponse<>(true, response.getData().message, null))
+                    consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null))
             );
         });
     }
@@ -1068,7 +1111,7 @@ public void linkEmail(@NotNull String email, @NotNull Consumer<ApiResponse<Strin
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -1090,7 +1133,7 @@ public void unlinkEmail(@NotNull Consumer<ApiResponse<String>> consumer) {
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -1114,7 +1157,7 @@ public void verifyEmail(@NotNull String code, @NotNull Consumer<ApiResponse<Stri
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -1185,7 +1228,7 @@ public void createNote(@NotNull UUID uuid, @NotNull String note, @NotNull Consum
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 
@@ -1259,7 +1302,7 @@ public void deleteNote(@NotNull UUID uuid, @NotNull String noteId, @NotNull Cons
                 consumer.accept(new ApiResponse<>(false, null, response.getError()));
                 return;
             }
-            consumer.accept(new ApiResponse<>(true, response.getData().message, null));
+            consumer.accept(new ApiResponse<>(true, response.getData().getMessage(), null));
         });
     }
 }