league args, more config stuff, stream proof

KebsCS · KebsCS · commit 26bf960f2199 · 2021-06-14T00:06:17.000+02:00
diff --git a/KBotExt/CustomTab.h b/KBotExt/CustomTab.h
@@ -12,18 +12,33 @@ class CustomTab
 	{
 		if (ImGui::BeginTabItem("Custom"))
 		{
+			static bool once = true;
+
 			static char method[50];
+			static char urlText[1024 * 16];
+			static char requestText[1024 * 16];
+
+			if (once)
+			{
+				once = false;
+				std::copy(S.customTab.method.begin(), S.customTab.method.end(), method);
+				std::copy(S.customTab.urlText.begin(), S.customTab.urlText.end(), urlText);
+				std::copy(S.customTab.requestText.begin(), S.customTab.requestText.end(), requestText);
+			}
+
 			ImGui::Text("Method:");
 			ImGui::InputText("##inputMethod", method, IM_ARRAYSIZE(method));
 
-			static char urlText[1024 * 16];
 			ImGui::Text("URL:");
 			ImGui::InputTextMultiline("##inputUrl", urlText, IM_ARRAYSIZE(urlText), ImVec2(600, 20));
 
-			static char requestText[1024 * 16];
 			ImGui::Text("Body:");
 			ImGui::InputTextMultiline("##inputBody", (requestText), IM_ARRAYSIZE(requestText), ImVec2(600, 100), ImGuiInputTextFlags_AllowTabInput);
 
+			S.customTab.method = method;
+			S.customTab.urlText = urlText;
+			S.customTab.requestText = requestText;
+
 			static std::string customHeader = auth->leagueHeader;
 			static int customPort = auth->leaguePort;
 
diff --git a/KBotExt/GameTab.h b/KBotExt/GameTab.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "Definitions.h"
 #include "Includes.h"
 #include "HTTP.h"
@@ -14,6 +16,7 @@ inline char instantMessage[50];
 class GameTab
 {
 public:
+
 	static void Render()
 	{
 		if (ImGui::BeginTabItem("Game"))
@@ -232,7 +235,7 @@ class GameTab
 				else
 					result = "Champion select not found";
 			}
-		
+
 			ImGui::Columns(1);
 
 			// TODO
@@ -244,16 +247,14 @@ class GameTab
 			ImGui::Checkbox("Instalock", &bInstalock);
 			if (ImGui::CollapsingHeader("Instalock champ"))
 			{
-				for (auto min : champsMinimal)
+				std::vector<std::pair<int, std::string>>instalockChamps = GetInstalockChamps();
+				for (auto champ : instalockChamps)
 				{
-					if (!min.owned)
-						continue;
-
 					char bufchamp[128];
-					sprintf_s(bufchamp, "##Select %s", min.alias.c_str());
-					ImGui::Text("%s", min.alias.c_str());
+					sprintf_s(bufchamp, "##Select %s", champ.second.c_str());
+					ImGui::Text("%s", champ.second.c_str());
 					ImGui::SameLine();
-					ImGui::RadioButton(bufchamp, &instalockID, min.id);
+					ImGui::RadioButton(bufchamp, &instalockID, champ.first);
 				}
 			}
 
@@ -327,4 +328,31 @@ class GameTab
 			ImGui::EndTabItem();
 		}
 	}
+
+	static std::vector<std::pair<int, std::string>> GetInstalockChamps()
+	{
+		std::vector<std::pair<int, std::string>>temp;
+
+		std::string result = http->Request("GET", "https://127.0.0.1/lol-champions/v1/owned-champions-minimal", "", auth->leagueHeader, "", "", auth->leaguePort);
+		Json::CharReaderBuilder builder;
+		const std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
+		JSONCPP_STRING err;
+		Json::Value root;
+		if (reader->parse(result.c_str(), result.c_str() + static_cast<int>(result.length()), &root, &err))
+		{
+			if (root.isArray())
+			{
+				for (Json::Value::ArrayIndex i = 0; i < root.size(); i++)
+				{
+					if (root[i]["freeToPlay"].asBool() == true || root[i]["ownership"]["owned"].asBool() == true)
+					{
+						std::pair<int, std::string > champ = { root[i]["id"].asInt() , root[i]["alias"].asString() };
+						temp.emplace_back(champ);
+					}
+				}
+			}
+		}
+
+		return temp;
+	}
 };
diff --git a/KBotExt/InfoTab.h b/KBotExt/InfoTab.h
@@ -5,6 +5,7 @@
 #include "HTTP.h"
 #include "Utils.h"
 #include "Auth.h"
+#include "Settings.h"
 
 class InfoTab
 {
@@ -13,6 +14,7 @@ class InfoTab
 	{
 		if (ImGui::BeginTabItem("Info"))
 		{
+			static bool once = true;
 			static std::string result;
 			static bool bPressed = false;
 
@@ -21,8 +23,15 @@ class InfoTab
 			static std::string summName;
 
 			static char playerName[50];
+			if (once)
+			{
+				once = false;
+				std::copy(S.infoTab.playerName.begin(), S.infoTab.playerName.end(), playerName);
+			}
+
 			ImGui::Text("Input player name:");
 			ImGui::InputText("##inputPlayerName", playerName, IM_ARRAYSIZE(playerName));
+			S.infoTab.playerName = playerName;
 			ImGui::SameLine();
 
 			if (ImGui::Button("Submit##playerName") || ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Enter), false))
diff --git a/KBotExt/InvokeTab.h b/KBotExt/InvokeTab.h
@@ -8,18 +8,33 @@ class InvokeTab
 	{
 		if (ImGui::BeginTabItem("Invoke"))
 		{
+			static bool once = true;
+
 			static char destination[1024 * 16];
+			static char method[1024 * 16];
+			static char args[1024 * 16];
+
+			if (once)
+			{
+				once = false;
+				std::copy(S.invokeTab.destination.begin(), S.invokeTab.destination.end(), destination);
+				std::copy(S.invokeTab.method.begin(), S.invokeTab.method.end(), method);
+				std::copy(S.invokeTab.args.begin(), S.invokeTab.args.end(), args);
+			}
+
 			ImGui::Text("Destination:");
 			ImGui::InputTextMultiline("##inputDestination", destination, IM_ARRAYSIZE(destination), ImVec2(600, 20));
 
-			static char method[1024 * 16];
 			ImGui::Text("Method:");
 			ImGui::InputTextMultiline("##inputMethod", method, IM_ARRAYSIZE(method), ImVec2(600, 20));
 
-			static char args[1024 * 16];
 			ImGui::Text("Args:");
 			ImGui::InputTextMultiline("##inputArgs", args, IM_ARRAYSIZE(args), ImVec2(600, 50));
 
+			S.invokeTab.destination = destination;
+			S.invokeTab.method = method;
+			S.invokeTab.args = args;
+
 			static std::string result;
 			if (ImGui::Button("Submit##submitInvoke"))
 			{
diff --git a/KBotExt/KBotExt.cpp b/KBotExt/KBotExt.cpp
@@ -27,6 +27,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	//Randomize using current time, todo swap with recent c++ random
 	srand(time(0));
 
+	bool oldStreamProof = S.streamProof;
+
 	CSettings::Load();
 
 	std::string sClassName = utils->RandomString(RandomInt(5, 10));
@@ -104,6 +106,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			::SetWindowPos(hwnd, 0, 0, 0, S.Window.width, S.Window.height, SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER);
 		}
 
+		if (oldStreamProof != S.streamProof)
+		{
+			oldStreamProof = S.streamProof;
+			if (oldStreamProof)
+				SetWindowDisplayAffinity(hwnd, WDA_EXCLUDEFROMCAPTURE);
+			else
+				SetWindowDisplayAffinity(hwnd, WDA_NONE);
+		}
+
 		//Start rendering
 		Direct3D9.StartFrame();
 
@@ -142,6 +153,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		std::this_thread::sleep_for(std::chrono::milliseconds(1));
 	}
 
+	CSettings::Save();
+
 	// Cleanup
 	ImGui_ImplDX11_Shutdown();
 	ImGui_ImplWin32_Shutdown();
diff --git a/KBotExt/LoginTab.h b/KBotExt/LoginTab.h
@@ -28,6 +28,16 @@ class LoginTab
 		if (ImGui::BeginTabItem("Login"))
 		{
 			static std::string result;
+			static bool once = true;
+			static char leagueArgs[1024 * 16];
+			static std::string sArgs;
+
+			if (once)
+			{
+				once = false;
+				std::copy(S.loginTab.leagueArgs.begin(), S.loginTab.leagueArgs.end(), leagueArgs);
+			}
+
 			ImGui::Columns(2, 0, false);
 
 			static std::vector<std::pair<std::string, std::string>>langs = {
@@ -40,7 +50,7 @@ class LoginTab
 				{"Vietnamese","vn_VN"},{"Indonesian","id_ID"},{"Chinese (Malaysia)","zh_MY"},{"Chinese (Taiwan)","zh_TW"}
 			};
 			// find saved lang from cfg file
-			auto findLang = std::find_if(langs.begin(), langs.end(), [](std::pair<std::string, std::string>k) { return k.second == S.language; });
+			auto findLang = std::find_if(langs.begin(), langs.end(), [](std::pair<std::string, std::string>k) { return k.second == S.loginTab.language; });
 
 			static std::pair<std::string, std::string>selectedLang = { findLang[0].first,findLang[0].second };
 
@@ -52,8 +62,8 @@ class LoginTab
 				}
 				else
 				{
-					ShellExecuteA(NULL, NULL, std::format("{}LeagueClient.exe", S.leaguePath).c_str(), std::format("--locale={}", selectedLang.second).c_str(), NULL, SW_SHOWNORMAL);
-					result = S.leaguePath + "LeagueClient.exe --locale=" + selectedLang.second; // todo custom arguments
+					ShellExecuteA(NULL, NULL, std::format("{}LeagueClient.exe", S.leaguePath).c_str(), sArgs.c_str(), NULL, SW_SHOWNORMAL);
+					result = S.leaguePath + "LeagueClient.exe " + sArgs;
 				}
 			}
 			ImGui::SameLine();
@@ -65,8 +75,17 @@ class LoginTab
 					if (ImGui::Selectable(lang.first.c_str(), lang.first == selectedLang.first))
 					{
 						selectedLang = { lang.first,lang.second };
-						S.language = lang.second;
+						S.loginTab.language = lang.second;
 						CSettings::Save();
+
+						std::string localeArg = std::format("--locale={} ", selectedLang.second);
+						size_t localePos = sArgs.find("--locale=");
+						if (localePos != std::string::npos)
+						{
+							sArgs.replace(localePos, localeArg.size(), localeArg);
+						}
+						else
+							sArgs += localeArg;
 					}
 				}
 				ImGui::EndCombo();
@@ -87,6 +106,14 @@ class LoginTab
 			}
 			ImGui::Columns(1);
 
+			std::copy(sArgs.begin(), sArgs.end(), leagueArgs);
+			ImGui::Text(" Args: ");
+			ImGui::SameLine();
+			ImGui::InputText("##inputLeagueArgs", leagueArgs, IM_ARRAYSIZE(leagueArgs));
+
+			sArgs = leagueArgs;
+			S.loginTab.leagueArgs = sArgs;
+
 			ImGui::Separator();
 
 			static char username[50];
@@ -139,7 +166,7 @@ class LoginTab
 			}
 
 			ImGui::SameLine();
-			Misc::HelpMarker("This part is only, if you want to save your login and pass to .txt file and login with 1 click. You don't have to do that, you can just log in the usual way in client and launch the tool anytime you want");
+			Misc::HelpMarker("This part is only, if you want to save your login and pass to config file and login with 1 click. You don't have to do that, you can just log in the usual way in client and launch the tool anytime you want");
 
 			ImGui::Separator();
 
diff --git a/KBotExt/Misc.h b/KBotExt/Misc.h
@@ -61,7 +61,7 @@ class Misc
 		if (reader->parse(getLatest.c_str(), getLatest.c_str() + static_cast<int>(getLatest.length()), &root, &err))
 		{
 			std::string latestName = root["tag_name"].asString();
-			if (latestName != "1.3.0")
+			if (latestName != "1.3.1")
 			{
 				if (MessageBoxA(0, "Open download website?", "New version available", MB_YESNO | MB_SETFOREGROUND) == IDYES)
 				{
diff --git a/KBotExt/Settings.h b/KBotExt/Settings.h
@@ -20,14 +20,44 @@ struct Settings
 	std::vector<std::string>vFonts;
 	int selectedFont = 0;
 	bool bAddFont = false;
-	std::string language = "en_US";
+	bool streamProof = false;
 
 	struct
 	{
 		int width = 700;
 		int height = 500;
 		bool resize = false;
 	}Window;
+
+	struct
+	{
+		std::string playerName;
+	}infoTab;
+
+	struct
+	{
+		std::string method;
+		std::string urlText;
+		std::string requestText;
+	}customTab;
+
+	struct
+	{
+		std::string destination;
+		std::string method;
+		std::string args;
+	}invokeTab;
+
+	struct
+	{
+		std::string language = "en_US";
+		std::string leagueArgs = "--locale=en_US";
+	}loginTab;
+
+	//struct
+	//{
+	//
+	//}profileTab;
 };
 extern Settings S;
 
@@ -59,7 +89,16 @@ class CSettings
 				root["window"]["width"] = S.Window.width;
 				root["window"]["height"] = S.Window.height;
 				root["selectedFont"] = S.selectedFont;
-				root["language"] = S.language;
+				root["loginTab"]["language"] = S.loginTab.language;
+				root["loginTab"]["leagueArgs"] = S.loginTab.leagueArgs;
+				root["streamProof"] = S.streamProof;
+				root["infoTab"]["playerName"] = S.infoTab.playerName;
+				root["customTab"]["method"] = S.customTab.method;
+				root["customTab"]["urlText"] = S.customTab.urlText;
+				root["customTab"]["requestText"] = S.customTab.requestText;
+				root["invokeTab"]["destination"] = S.invokeTab.destination;
+				root["invokeTab"]["method"] = S.invokeTab.method;
+				root["invokeTab"]["args"] = S.invokeTab.args;
 
 				if (S.bAddFont)
 				{
@@ -110,7 +149,16 @@ class CSettings
 				if (auto t = root["window"]["width"]; !t.empty()) S.Window.width = t.asInt();
 				if (auto t = root["window"]["height"]; !t.empty()) S.Window.height = t.asInt();
 				if (auto t = root["selectedFont"]; !t.empty()) S.selectedFont = t.asInt();
-				if (auto t = root["language"]; !t.empty()) S.language = t.asString();
+				if (auto t = root["loginTab"]["language"]; !t.empty()) S.loginTab.language = t.asString();
+				if (auto t = root["loginTab"]["leagueArgs"]; !t.empty()) S.loginTab.leagueArgs = t.asString();
+				if (auto t = root["streamProof"]; !t.empty()) S.streamProof = t.asBool();
+				if (auto t = root["infoTab"]["playerName"]; !t.empty()) S.infoTab.playerName = t.asString();
+				if (auto t = root["customTab"]["method"]; !t.empty()) S.customTab.method = t.asString();
+				if (auto t = root["customTab"]["urlText"]; !t.empty()) S.customTab.urlText = t.asString();
+				if (auto t = root["customTab"]["requestText"]; !t.empty()) S.customTab.requestText = t.asString();
+				if (auto t = root["invokeTab"]["destination"]; !t.empty()) S.invokeTab.destination = t.asString();
+				if (auto t = root["invokeTab"]["method"]; !t.empty()) S.invokeTab.method = t.asString();
+				if (auto t = root["invokeTab"]["args"]; !t.empty()) S.invokeTab.args = t.asString();
 
 				if (root["fonts"].isArray() && !root["fonts"].empty())
 				{
diff --git a/KBotExt/SettingsTab.h b/KBotExt/SettingsTab.h

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class Misc`
`61`	`61`	`if (reader->parse(getLatest.c_str(), getLatest.c_str() + static_cast<int>(getLatest.length()), &root, &err))`
`62`	`62`	`{`
`63`	`63`	`std::string latestName = root["tag_name"].asString();`
`64`		`- if (latestName != "1.3.0")`
	`64`	`+ if (latestName != "1.3.1")`
`65`	`65`	`{`
`66`	`66`	`if (MessageBoxA(0, "Open download website?", "New version available", MB_YESNO \| MB_SETFOREGROUND) == IDYES)`
`67`	`67`	`{`