bug fix, updated

changed results per page for captain search, added captain search seed.

Author: ProjectBots

StreamRaidersBot/Bot/src/program/SRR.java

@@ -312,7 +312,7 @@ public String leaveCaptain(String captainId) throws NoConnectionException {
 
 
 
-	public String getCaptainsForSearch(int page, int resultsPerPage, boolean fav, boolean live, String mode, boolean searchForCaptain, String name) throws NoConnectionException {
+	public String getCaptainsForSearch(int page, String seed, boolean fav, boolean live, String mode, boolean searchForCaptain, String name) throws NoConnectionException {
 		JsonObject filter = new JsonObject();
 		filter.addProperty("ambassadors", "false");
 		filter.addProperty("favorite", (fav ? "true" : "false"));
@@ -323,8 +323,9 @@ public String getCaptainsForSearch(int page, int resultsPerPage, boolean fav, bo
 
 		Http post = getPost("getCaptainsForSearch");
 		post.addEncArg("page", ""+page);
-		post.addEncArg("resultsPerPage", ""+resultsPerPage);
+		post.addEncArg("resultsPerPage", "30");
 		post.addEncArg("filters", filter.toString());
+		post.addEncArg("seed", seed==null?"0":seed);
 
 		return sendPost(post);
 	}

StreamRaidersBot/Bot/src/program/SRRHelper.java

@@ -309,7 +309,7 @@ public int getPagesFromLastSearch() {
 	}
 
 	public JsonArray search(int page, int resultsPerPage, boolean fav, boolean live, String mode, boolean searchForCaptain, String name) throws NoConnectionException {
-		JsonObject rawd = Json.parseObj(req.getCaptainsForSearch(page, resultsPerPage, fav, live, mode, searchForCaptain, name));
+		JsonObject rawd = Json.parseObj(req.getCaptainsForSearch(page, null, fav, live, mode, searchForCaptain, name));
 		if(rawd == null) {
 			Debug.print("SRRHelper -> search: rawd=null", Debug.runerr, Debug.error, null, null, true);
 			return new JsonArray();

StreamRaidersBot/Bot/src/run/BackEndHandler.java

@@ -318,25 +318,9 @@ synchronized public void updateCaps(boolean force, boolean dungeon) throws NoCon
 			return;
 
 		JsonArray rawCaps = new JsonArray();
-		int last = 10;
-		for(int i=1; i<=last; i++) {
-			JsonObject raw = Json.parseObj(req.getCaptainsForSearch(i, 8, false, true, dungeon ? SRC.Search.dungeons : SRC.Search.campaign, false, null));
-			if(testUpdate(raw))
-				raw = Json.parseObj(req.getCaptainsForSearch(i, 8, false, true, dungeon ? SRC.Search.dungeons : SRC.Search.campaign, false, null));
-			
-			JsonObject data = raw.getAsJsonObject("data");
-			last = data.get("lastPage").getAsInt();
-			
-			JsonArray loyalty = data.getAsJsonArray("pveLoyalty");
-			JsonArray captains = data.getAsJsonArray("captains");
-			
-			for(int j=0; j<loyalty.size(); j++) {
-				captains.get(j).getAsJsonObject().addProperty(SRC.Raid.pveWins, loyalty.get(j).getAsJsonObject().getAsJsonPrimitive(SRC.Raid.pveWins).getAsInt());
-				captains.get(j).getAsJsonObject().addProperty(SRC.Raid.pveLoyaltyLevel, loyalty.get(j).getAsJsonObject().getAsJsonPrimitive(SRC.Raid.pveLoyaltyLevel).getAsInt());
-			}
-			
-			rawCaps.addAll(captains);
-		}
+		SeedAndLastPage sap = new SeedAndLastPage();
+		for(int i=1; i<=sap.lastPage; i++)
+			rawCaps.addAll(searchCap(i, sap, false, true, dungeon ? SRC.Search.dungeons : SRC.Search.campaign, false, null));
 
 		Captain[] caps = new Captain[rawCaps.size()];
 
@@ -349,31 +333,50 @@ synchronized public void updateCaps(boolean force, boolean dungeon) throws NoCon
 		uelis.afterUpdate("caps::"+dungeon);
 	}
 
-	public synchronized void setCaps(Captain[] caps, boolean dungeon) {
+	synchronized public void setCaps(Captain[] caps, boolean dungeon) {
 		if(dungeon)
 			dunCaps = caps;
 		else
 			this.caps = caps;
 	}
 
-	public JsonArray searchCap(int page, int resultsPerPage, boolean fav, boolean live, String mode, boolean searchForCaptain, String name) throws NoConnectionException, NotAuthorizedException {
-		JsonObject rawd = Json.parseObj(req.getCaptainsForSearch(page, resultsPerPage, fav, live, mode, searchForCaptain, name));
-		if(testUpdate(rawd))
-			rawd = Json.parseObj(req.getCaptainsForSearch(page, resultsPerPage, fav, live, mode, searchForCaptain, name));
+	private static class SeedAndLastPage {
+		public String seed = "0";
+		public int lastPage = 10;
+		public SeedAndLastPage() {}
+		public SeedAndLastPage(String seed) {
+			this.seed = seed;
+		}
+	}
+	
+	private JsonArray searchCap(int page, SeedAndLastPage sap, boolean fav, boolean live, String mode, boolean searchForCaptain, String name) throws NoConnectionException, NotAuthorizedException {
+		JsonObject raw = Json.parseObj(req.getCaptainsForSearch(page, sap.seed, fav, live, mode, searchForCaptain, name));
+		if(testUpdate(raw))
+			raw = Json.parseObj(req.getCaptainsForSearch(page, sap.seed, fav, live, mode, searchForCaptain, name));
 
-		JsonObject raw = rawd.getAsJsonObject("data");
+		JsonObject data = raw.getAsJsonObject("data");
 
-		JsonArray loyalty = raw.getAsJsonArray("pveLoyalty");
-		JsonArray captains = raw.getAsJsonArray("captains");
+		sap.seed = data.get("seed").getAsString();
+		sap.lastPage = data.get("lastPage").getAsInt();
 
-		for(int i=0; i<loyalty.size(); i++) {
-			captains.get(i).getAsJsonObject().addProperty(SRC.Raid.pveWins, loyalty.get(i).getAsJsonObject().getAsJsonPrimitive(SRC.Raid.pveWins).getAsInt());
-			captains.get(i).getAsJsonObject().addProperty(SRC.Raid.pveLoyaltyLevel, loyalty.get(i).getAsJsonObject().getAsJsonPrimitive(SRC.Raid.pveLoyaltyLevel).getAsInt());
+		JsonArray loyalty = data.getAsJsonArray("pveLoyalty");
+		JsonArray captains = data.getAsJsonArray("captains");
+		
+		for(int j=0; j<loyalty.size(); j++) {
+			JsonElement cap = captains.get(j);
+			if(!cap.isJsonObject())
+				continue;
+			cap.getAsJsonObject().addProperty(SRC.Raid.pveWins, loyalty.get(j).getAsJsonObject().getAsJsonPrimitive(SRC.Raid.pveWins).getAsInt());
+			cap.getAsJsonObject().addProperty(SRC.Raid.pveLoyaltyLevel, loyalty.get(j).getAsJsonObject().getAsJsonPrimitive(SRC.Raid.pveLoyaltyLevel).getAsInt());
 		}
 
 		return captains;
 	}
 
+	public JsonArray searchCap(int page, String seed, boolean fav, boolean live, String mode, boolean searchForCaptain, String name) throws NoConnectionException, NotAuthorizedException {
+		return searchCap(page, new SeedAndLastPage(seed), fav, live, mode, searchForCaptain, name);
+	}
+	
 	public Captain[] getCaps(boolean dungeon) throws NoConnectionException, NotAuthorizedException {
 		updateCaps(false, dungeon);
 		return dungeon 

StreamRaidersBot/Bot/src/run/Run.java

@@ -193,7 +193,7 @@ public void afterUpdate(String obj) {
 							if(got.contains(tdn) || !ConfigsV2.getCapBoo(cid, currentLayer, tdn, dungeon ? ConfigsV2.dungeon : ConfigsV2.campaign, ConfigsV2.il))
 								continue;
 
-							JsonArray results = beh.searchCap(1, 8, false, false, dungeon ? SRC.Search.dungeons : SRC.Search.campaign, true, tdn);
+							JsonArray results = beh.searchCap(1, null, false, false, dungeon ? SRC.Search.dungeons : SRC.Search.campaign, true, tdn);
 							if(results.size() == 0)
 								continue;
 

StreamRaidersBot/GraphicalUserInterface/src/userInterface/CapSearch.java

@@ -50,7 +50,7 @@ public void open(GUI parent, ListType list, String search) {
 			public void run() {
 				JsonArray caps;
 				try {
-					caps = Manager.getProfile(cid).getBackEndHandler().searchCap(1, 8, false, false, SRC.Search.all, true, search);
+					caps = Manager.getProfile(cid).getBackEndHandler().searchCap(1, null, false, false, SRC.Search.all, true, search);
 				} catch (NoConnectionException | NotAuthorizedException e) {
 					Debug.printException("CapSearch -> open: err=failed to search captain", e, Debug.general, Debug.error, null, null, true);
 					return;