added new event, started with captain mode, bug fixes, updated

Author: ProjectBots

StreamRaidersBot/Bot/src/include/Http.java

@@ -6,7 +6,6 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -87,7 +86,7 @@ public NoConnectionException(Exception e) {
 	private String url = "";
 	private BasicHeader[] headers = new BasicHeader[0];
 	private String[][] urlArgs = new String[0][0];
-	private List<NameValuePair> encArgs = new ArrayList<NameValuePair>();
+	private ArrayList<NameValuePair> encArgs = new ArrayList<NameValuePair>();
 
 	public void setUrl(String url) {
 		this.url = url;
@@ -112,6 +111,12 @@ public void addEncArg(String name, String value) {
 		encArgs.add(new BasicNameValuePair(name, value));
 	}
 
+	public void remEncArg(String name) {
+		encArgs.removeIf(nvp -> {
+			return nvp.getName().equals(name);
+		});
+	}
+	
 	public String getEncArg(String name) {
 		for(NameValuePair bnvp : encArgs)
 			if(bnvp.getName().equals(name))

StreamRaidersBot/Bot/src/program/Captain.java

@@ -192,12 +192,11 @@ public Str(String con) {
 
 	public static final Str dungeonSlot = new Str("dungeonSlot");
 	public static final Str lname = new Str("name");
-	//public static final Str canBuyChest = new Str("canBuyChest");
-	//public static final Str canBuyEventChest = new Str("canBuyEventChest");
 	public static final Str userAgent = new Str("userAgent");
 	public static final Str proxyDomain = new Str("proxyDomain");
 	public static final Str proxyUser = new Str("proxyUser");
 	public static final Str proxyPass = new Str("proxyPass");
+	public static final Str captainTeam = new Str("captainTeam");	//TODO rem after event
 
 	public static String getStr(String cid, String lay, Str con) {
 		if(lay.equals("(all)")) {

StreamRaidersBot/Bot/src/program/ConfigsV2.java

@@ -24,6 +24,7 @@ public String getEur() {
 	public static final List<Don> dons = Collections.unmodifiableList(new ArrayList<Don>() {
 		private static final long serialVersionUID = 1L;
 		{
+			add(new Don("DJ Lively Pants", 15000, 0, "Thanks for such a great way for me to not waste time during the day! And your community on Discord is fantastic. Thanks BearHugsByDay!"));
 			add(new Don("Skyzor", 5266, 0, "Real men support"));
 			add(new Don("Obelisk", 2201, 0, "thanks for taking the time from your schedule to make this :)"));
 			add(new Don("Snugsel", 2000, 0, ""));

StreamRaidersBot/Bot/src/program/Donators.java

@@ -9,6 +9,7 @@
 import com.google.gson.JsonPrimitive;
 
 import include.Json;
+import program.viewer.Raid;
 
 public class Map {
 
@@ -46,7 +47,7 @@ private int hl() {
 
 	public Map(JsonObject mapData, Raid raid, JsonObject plan, String name, List<String> userIds, String cid, int slot) {
 		if(mapData == null)
-			new run.Run.StreamRaidersException("Map -> const: err=mapData is null, mapName="+name, cid, slot);
+			new run.StreamRaidersException("Map -> const: err=mapData is null, mapName="+name, cid, slot);
 		this.cid = cid;
 		this.slot = slot;
 		this.name = name;

StreamRaidersBot/Bot/src/program/Map.java

@@ -38,24 +38,38 @@ public void setUserAgent(String ua) {
 		userAgent = ua;
 	}
 
-	private String cookies = "";
-	private String userId = null;
-	private String isCaptain = "";
+	private final String cookies;
+	private String viewerUserId = null;
+	private String captainUserId = null;
+	private boolean playsAsCaptain;
+	private boolean canPlayAsCaptain;
 	private String gameDataVersion = "";
 	private String clientVersion = "";
-	private String clientPlatform = "WebGL";
+	private static final String clientPlatform = "WebGL";
 
-	public String getUserId() {
-		return userId;
+	public String getViewerUserId() {
+		return viewerUserId;
+	}
+	
+	public String getCaptainUserId() {
+		return captainUserId;
+	}
+	
+	public boolean canPlayCaptain() {
+		return canPlayAsCaptain;
+	}
+	
+	public boolean playsAsCaptain() {
+		return playsAsCaptain;
 	}
 
 	private static List<String> userIds = new ArrayList<String>();
 
-	public static List<String> getUserIds() {
+	public static List<String> getViewerUserIds() {
 		return userIds;
 	}
 
-	synchronized public static void addUserId(String uid) {
+	synchronized public static void addViewerUserId(String uid) {
 		if(!userIds.contains(uid))
 			userIds.add(uid);
 	}
@@ -102,13 +116,12 @@ public SRR(String cid, String clientVersion) throws NoConnectionException, Outda
 		this.cookies = ConfigsV2.getPStr(cid, ConfigsV2.cookies);
 		this.clientVersion = clientVersion;
 		reload();
-		addUserId(userId);
+		addViewerUserId(viewerUserId);
 	}
 
 	public String reload() throws NoConnectionException, OutdatedDataException, NotAuthorizedException {
-		userId = null;
+		viewerUserId = null;
 		gameDataVersion = "";
-		isCaptain = "";
 		JsonObject raw = Json.parseObj(getUser());
 		JsonObject info = raw.getAsJsonObject("info");
 		String datapath = info.get("dataPath").getAsString();
@@ -134,10 +147,23 @@ private void constructor(JsonObject getUser) throws NotAuthorizedException {
 		this.gameDataVersion = getUser.getAsJsonObject("info").get("dataVersion").getAsString();
 		try {
 			JsonObject data = getUser.getAsJsonObject("data");
-			this.isCaptain = "0";
-			this.userId = data.get("userId").getAsString();
-			if(userId.endsWith("c"))
-				userId = data.get("otherUserId").getAsString();
+			canPlayAsCaptain = data.get("hasCaptainPrivileges").getAsBoolean();
+			if(!canPlayAsCaptain) {
+				this.viewerUserId = data.get("userId").getAsString();
+				playsAsCaptain = false;
+			} else {
+				String uid = data.get("userId").getAsString();
+				String oid = data.get("otherUserId").getAsString();
+				if(data.get("isCaptain").getAsInt() == 0) {
+					playsAsCaptain = false;
+					captainUserId = oid;
+					viewerUserId = uid;
+				} else {
+					playsAsCaptain = true;
+					captainUserId = uid;
+					viewerUserId = oid;
+				}
+			}
 		} catch (ClassCastException e) {
 			JsonElement err = getUser.get(SRC.errorMessage);
 			if(err.isJsonPrimitive() && err.getAsString().equals("User is not authorized.")) {
@@ -149,13 +175,26 @@ private void constructor(JsonObject getUser) throws NotAuthorizedException {
 	}
 
 
-	
 	public Http getPost(String cn) {
 		return getPost(cn, true);
 	}
 
 
 	private Http getPost(String cn, boolean addUser) {
+		Http post = getPurePost(cn);
+		
+		if(viewerUserId != null && addUser) {
+			post.addEncArg("userId", playsAsCaptain ? viewerUserId : captainUserId);
+			post.addEncArg("isCaptain", playsAsCaptain ? "1" : "0");
+		}
+		post.addEncArg("gameDataVersion", gameDataVersion);
+		post.addEncArg("clientVersion", clientVersion);
+		post.addEncArg("clientPlatform", clientPlatform);
+		
+		return post;
+	}
+	
+	private Http getPurePost(String cn) {
 		Http post = new Http();
 		if(proxyDomain != null)
 			post.setProxy(proxyDomain, proxyPort, proxyUser, proxyPass);
@@ -166,18 +205,12 @@ private Http getPost(String cn, boolean addUser) {
 		post.setUrl("https://www.streamraiders.com/api/game/");
 		post.addUrlArg("cn", cn);
 
-		if(userId != null && addUser) {
-			post.addEncArg("userId", userId);
-			post.addEncArg("isCaptain", isCaptain);
-		}
-		post.addEncArg("gameDataVersion", gameDataVersion);
 		post.addEncArg("command", cn);
-		post.addEncArg("clientVersion", clientVersion);
-		post.addEncArg("clientPlatform", clientPlatform);
 
 		return post;
 	}
 
+	
 	private String sendPost(Http post) throws NoConnectionException {
 		String p;
 		try {
@@ -211,6 +244,10 @@ public String getUser() throws NoConnectionException {
 		return sendPost(post);
 	}
 
+	public String switchUserAccountType() throws NoConnectionException {
+		return sendPost(getPurePost("switchUserAccountType"));
+	}
+	
 
 	public String unlockUnit(String unitType) throws NoConnectionException {
 		Http post = getPost("unlockUnit");
@@ -286,7 +323,7 @@ public String grantEventReward(String eventId, String rewardTier, boolean collec
 	public String getUserEventProgression() throws NoConnectionException {
 		Http post = getPost("getUserEventProgression", false);
 		post.addEncArg("userId", "");
-		post.addEncArg("isCaptain", isCaptain);
+		post.addEncArg("isCaptain", playsAsCaptain ? "1" : "0");
 		return sendPost(post);
 	}
 
@@ -315,7 +352,7 @@ public String leaveCaptain(String captainId) throws NoConnectionException {
 
 
 
-	public String getCaptainsForSearch(int page, String seed, boolean fav, boolean live, String mode, boolean searchForCaptain, String name) throws NoConnectionException {
+	public String getCaptainsForSearch(String page, String resultsPerPage, 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"));
@@ -325,8 +362,8 @@ public String getCaptainsForSearch(int page, String seed, boolean fav, boolean l
 			filter.addProperty("mode", mode);
 
 		Http post = getPost("getCaptainsForSearch");
-		post.addEncArg("page", ""+page);
-		post.addEncArg("resultsPerPage", "30");
+		post.addEncArg("page", page);
+		post.addEncArg("resultsPerPage", resultsPerPage);
 		post.addEncArg("filters", filter.toString());
 		post.addEncArg("seed", seed==null?"0":seed);
 

StreamRaidersBot/Bot/src/program/SRR.java

@@ -0,0 +1,30 @@
+package program.viewer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+import program.SRC;
+
+public class CaptainData {
+
+	private final JsonObject cap;
+	
+	public CaptainData(JsonObject cap) {
+		this.cap = cap;
+	}
+	
+	public String get(String con) {
+		if(!cap.has(con))
+			return null;
+		JsonElement je = cap.get(con);
+		if(!je.isJsonPrimitive())
+			return null;
+		return je.getAsString();
+	}
+	
+	@Override
+	public String toString() {
+		return get(SRC.Captain.twitchDisplayName);
+	}
+	
+}

StreamRaidersBot/Bot/src/program/viewer/CaptainData.java

@@ -1,4 +1,4 @@
-package program;
+package program.viewer;
 
 import java.util.Hashtable;
 
@@ -8,6 +8,10 @@
 
 import include.Json;
 import include.Time;
+import program.Debug;
+import program.Options;
+import program.SRC;
+import program.Store;
 
 public class Raid {
 

…reamRaidersBot/Bot/src/program/Raid.java …dersBot/Bot/src/program/viewer/Raid.javaStreamRaidersBot/Bot/src/program/Raid.java renamed to StreamRaidersBot/Bot/src/program/viewer/Raid.java StreamRaidersBot/Bot/src/program/Raid.java renamed to StreamRaidersBot/Bot/src/program/viewer/Raid.java

@@ -4,7 +4,7 @@
 
 import com.google.gson.JsonObject;
 
-import program.Raid;
+import program.viewer.Raid;
 
 public interface BotListener {
 	/**
@@ -59,7 +59,7 @@ public default void onProfileLoadComplete(String cid, int pos) {}
 	 * will be called if a profile failed to load
 	 * @param cid profile id
 	 * @param pos a instance unique number assigned to the profile starting from 0 and counting up. Can change when restarted, but keeps the order in which the profiles where added.
-	 * @param e Exception thrown [{@link program.Run.SilentException}, {@link program.SRR.NotAuthorizedException}, {@link program.SRR.NotAuthorizedException}, {@link program.SRR.OutdatedDataException}, {@link java.lang.Exception}]
+	 * @param e Exception thrown [{@link run.Viewer.Run.SilentException}, {@link program.SRR.NotAuthorizedException}, {@link program.SRR.NotAuthorizedException}, {@link program.SRR.OutdatedDataException}, {@link java.lang.Exception}]
 	 */
 	public default void onProfileLoadError(String cid, int pos, Exception e) {}
 

StreamRaidersBot/Bot/src/run/BotListener.java

@@ -0,0 +1,5 @@
+package run;
+
+public class Captain {
+
+}