new api changes

Author: swanis

REQUESTS.md

@@ -18,6 +18,7 @@ ListBansRequest (Ban[])
 ModifyYourselfRequest(String customTitle, String aboutMe, String signature) (Void)  
 RetrieveMemberByIDRequest(int memberId) (Member)  
 RetrieveMemberByUsernameRequest(String username) (Member)  
+RetrieveMemberByDiscordIDRequest(long discordId) (Member)  
 RetrieveYourselfRequest (Member)
 
 ## Profile Posts
@@ -39,7 +40,6 @@ ListResourceDownloadsByVersionRequest(int resourceId, int versionId, SortOptions
 ListResourceDownloadsRequest(int resourceId, SortOptions sortOptions) (Download[])
 
 ## Resource Licenses
-IssueResourceLicenseRequest(int resourceId, boolean permanent, boolean active, int purchaserId, long startDate, long endDate) (Integer)  
 ListResourceLicensesRequest(int resourceId, SortOptions sortOptions) (License[])  
 ModifyResourceLicenseRequest(int resourceId, int licenseId, boolean permanent, boolean active, long startDate, long endDate) (Void)  
 RetrieveResourceLicenseRequest(int resourceId, int licenseId) (License)  

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>is.swan</groupId>
     <artifactId>mcmarket-api-java-wrapper</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

src/main/java/is/swan/mcmarketapi/classes/Member.java

@@ -5,21 +5,23 @@ public class Member {
     private final int member_id;
     private final String username;
     private final long join_date, last_activity_date;
-    private final String gender, timezone;
-    private final boolean banned, suspended, restricted, disabled;
+    private final boolean banned, suspended, restricted, disabled, premium, supreme, ultimate;
+    private final long discord_id;
     private final int post_count, resource_count, purchase_count, feedback_positive, feedback_neutral, feedback_negative;
 
-    public Member(int member_id, String username, long join_date, long last_activity_date, String gender, String timezone, boolean banned, boolean suspended, boolean restricted, boolean disabled, int post_count, int resource_count, int purchase_count, int feedback_positive, int feedback_neutral, int feedback_negative) {
+    public Member(int member_id, String username, long join_date, long last_activity_date, boolean banned, boolean suspended, boolean restricted, boolean disabled, boolean premium, boolean supreme, boolean ultimate, long discord_id, int post_count, int resource_count, int purchase_count, int feedback_positive, int feedback_neutral, int feedback_negative) {
         this.member_id = member_id;
         this.username = username;
         this.join_date = join_date;
         this.last_activity_date = last_activity_date;
-        this.gender = gender;
-        this.timezone = timezone;
         this.banned = banned;
         this.suspended = suspended;
         this.restricted = restricted;
         this.disabled = disabled;
+        this.premium = premium;
+        this.supreme = supreme;
+        this.ultimate = ultimate;
+        this.discord_id = discord_id;
         this.post_count = post_count;
         this.resource_count = resource_count;
         this.purchase_count = purchase_count;
@@ -44,14 +46,6 @@ public long getLastActivityDate() {
         return last_activity_date;
     }
 
-    public String getGender() {
-        return gender;
-    }
-
-    public String getTimezone() {
-        return timezone;
-    }
-
     public boolean isBanned() {
         return banned;
     }
@@ -68,6 +62,22 @@ public boolean isDisabled() {
         return disabled;
     }
 
+    public boolean isPremium() {
+        return premium;
+    }
+
+    public boolean isSupreme() {
+        return supreme;
+    }
+
+    public boolean isUltimate() {
+        return ultimate;
+    }
+
+    public long getDiscordId() {
+        return discord_id;
+    }
+
     public int getPostCount() {
         return post_count;
     }

src/main/java/is/swan/mcmarketapi/request/Client.java

@@ -27,32 +27,32 @@ public <V> Response<V> send(Request<V> request) {
     }
 
     public <V> Response<V> sendOrWait(Request<V> request) {
-    	long stallFor;
-    	while ((stallFor = this.throttler.stallFor(request.getMethod())) > 0) {
+        long stallFor;
+        while ((stallFor = this.throttler.stallFor(request.getMethod())) > 0) {
             try {
                 Thread.sleep(stallFor);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-    	}
-    	
+        }
+
         Response<V> response = getResponse(request);
-        
+
         if (response.isRatelimited()) {
-        	if (request.getMethod() == Method.GET) {
-        		throttler.setRead(response.getMillisecondsToWait());
-        	} else {
-        		throttler.setWrite(response.getMillisecondsToWait());	
-        	}
-        	
-        	return sendOrWait(request);
+            if (request.getMethod() == Method.GET) {
+                throttler.setRead(response.getMillisecondsToWait());
+            } else {
+                throttler.setWrite(response.getMillisecondsToWait());
+            }
+
+            return sendOrWait(request);
         }
 
-    	if (request.getMethod() == Method.GET) {
-    		throttler.resetRead();
-    	} else {
-    		throttler.resetWrite();
-    	}
+        if (request.getMethod() == Method.GET) {
+            throttler.resetRead();
+        } else {
+            throttler.resetWrite();
+        }
 
         if (response.getError() != null) {
             return response;
@@ -64,7 +64,7 @@ public <V> Response<V> sendOrWait(Request<V> request) {
     }
 
     private <V> Response<V> getResponse(Request<V> request) {
-        return switch(request.getMethod()) {
+        return switch (request.getMethod()) {
             case GET -> HTTPUtil.get(request.getURL(), token);
             case POST -> HTTPUtil.post(request.getURL(), request.getBody(), token);
             case DELETE -> HTTPUtil.delete(request.getURL(), token);

src/main/java/is/swan/mcmarketapi/request/requests/member/RetrieveMemberByDiscordIDRequest.java

@@ -0,0 +1,33 @@
+package is.swan.mcmarketapi.request.requests.member;
+
+import com.google.gson.JsonElement;
+import is.swan.mcmarketapi.classes.Member;
+import is.swan.mcmarketapi.request.Request;
+
+public class RetrieveMemberByDiscordIDRequest implements Request<Member> {
+
+    private final long discordId;
+
+    public RetrieveMemberByDiscordIDRequest(long discordId) {
+        this.discordId = discordId;
+    }
+
+    @Override
+    public String getURL() {
+        return "https://api.mc-market.org/v1/members/discords/" + discordId;
+    }
+
+    @Override
+    public Method getMethod() {
+        return Method.GET;
+    }
+
+    @Override
+    public Member handleJson(String json) {
+        JsonElement element = gson.fromJson(json, JsonElement.class);
+        String memberJson = element.getAsJsonObject().get("data").getAsJsonObject().toString();
+        Member member = gson.fromJson(memberJson, Member.class);
+
+        return member;
+    }
+}