Merge pull request #1 from dec4234/dec4234-patch-1

Moving forward for first production release

Author: dec4234

JavaDestinyAPI/src/main/java/material/clan/Clan.java

@@ -33,6 +33,7 @@ public class Clan {
 	private BungieUser founder;
 	private List<BungieUser> admins;
 	private List<BungieUser> members = new ArrayList<>();
+	private ClanManagement clanManagement;
 
 	public Clan(long clanId) {
 		this.clanId = clanId;
@@ -114,4 +115,10 @@ public List<BungieUser> getMembers() {
 
 		return members;
 	}
+
+	public ClanManagement getClanManagement() {
+		if(clanManagement != null) return clanManagement;
+		clanManagement = new ClanManagement(this);
+		return  clanManagement;
+	}
 }

JavaDestinyAPI/src/main/java/material/clan/ClanManagement.java

@@ -36,7 +36,28 @@ public void kickPlayer(BungieUser bungieUser) {
 	 * Bans the user from the clan
 	 */
 	public void banUser(BungieUser bungieUser) {
+		hu.urlRequestPOSTOauth("https://www.bungie.net/Platform/GroupV2/" + clan.getClanID() + "/Members/" + bungieUser.getMembershipType() + "/" + bungieUser.getBungieMembershipID() + "/Ban/", "");
+	}
+
+	/**
+	 * Unbans this user from the clan, as long as they are banned, of course
+	 */
+	public void unbanUser(BungieUser bungieUser) {
+		hu.urlRequestPOSTOauth("https://www.bungie.net/Platform/GroupV2/" + clan.getClanID() + "/Members/" + bungieUser.getMembershipType() + "/" + bungieUser.getBungieMembershipID() + "/Unban/", "");
+	}
 
+	/**
+	 * Invites the specified user to join the clan
+	 */
+	public void inviteUser(BungieUser bungieUser) {
+		hu.urlRequestPOSTOauth("https://www.bungie.net/Platform/GroupV2/" + clan.getClanID() + "/Members/IndividualInvite/" + bungieUser.getMembershipType() + "/" + bungieUser.getBungieMembershipID() + "/", "");
+	}
+
+	/**
+	 * Cancels the invite for this user to join the clan
+	 */
+	public void cancelInvite(BungieUser bungieUser) {
+		hu.urlRequestPOSTOauth("https://www.bungie.net/Platform/GroupV2/" + clan.getClanID() + "/Members/IndividualInviteCancel/" + bungieUser.getMembershipType() + "/" + bungieUser.getBungieMembershipID() + "/", "");
 	}
 
 	/**
@@ -61,7 +82,7 @@ public void denyAllPendingMembers() {
 	}
 
 	/**
-	 * Abdicates foundership to the next admin in the line of succession
+	 * Abdicates foundership to the admin specified (This user must already be an admin of the clan)
 	 * @param bungieUser The user who will be the new founder (leader) of the clan
 	 */
 	public void abdicateFoundership(BungieUser bungieUser) {

JavaDestinyAPI/src/main/java/material/user/BungieUser.java

@@ -29,6 +29,7 @@ public class BungieUser {
 	private boolean isPublic;
 	private int membershipType;
 	private List<Character> characters;
+	private int playTime = -1;
 
 	private String iconPath;
 	private Clan clan;
@@ -106,16 +107,25 @@ private void assignValues() {
 	/**
 	 * Currently not working
 	 */
-	@Deprecated
 	public List<Character> getCharacters() {
 		if(clan != null) return characters;
 		characters = new ArrayList<>();
-		JsonObject jo = hu.urlRequestGET("https://www.bungie.net/Platform/Destiny2/" + getMembershipType() + "/Profile/" + bungieMembershipID + "/?components=200").getAsJsonObject("Response").getAsJsonObject("characters");
-
+		JsonArray ja = hu.urlRequestGET("https://www.bungie.net/Platform/Destiny2/" + getMembershipType() + "/Profile/" + bungieMembershipID + "/?components=100").getAsJsonObject("Response").getAsJsonObject("profile").getAsJsonObject("data").getAsJsonArray("characterIds");
+		for(JsonElement je : ja) {
+			characters.add(new Character(this, je.getAsString()));
+		}
 
 		return characters;
 	}
 
+	public int getTimePlayed() {
+		if(playTime != -1) return playTime;
+		for(Character c : getCharacters()) {
+			playTime += Integer.parseInt(c.getMinutesPlayedTotal());
+		}
+		return playTime;
+	}
+
 	/**
 	 * Gets the clan that this user is a member of
 	 */