v0.4

SvenDPP/SvenDPP/DiscordAPI.h

@@ -5,6 +5,7 @@ struct structDiscord
 	char chMsg[256];
 	ULONG64 uChanId = -1;
 	cluster* clBot = nullptr;
+	bool bShowCountry = false;
 };
 
 class CDiscordAPI

SvenDPP/SvenDPP/DllMain.cpp

@@ -5,6 +5,7 @@ CUtils g_Utils;
 CConsole g_Console;
 CServerAPI g_ServerAPI;
 CDiscordAPI g_DiscordAPI;
+CSteamWebAPI g_SteamWebAPI;
 
 UnknownFuncFn OrigUnknownFunc = NULL;
 UnknownFuncFn2 OrigUnknownFunc2 = NULL;
@@ -13,15 +14,57 @@ UnknownFuncFn3 OrigUnknownFunc3 = NULL;
 DWORD WINAPI AsyncMessage(LPVOID lpParam)
 {
 	structDiscord* pStructDiscord = (structDiscord*)lpParam;
-	g_DiscordAPI.SendBotMessage(pStructDiscord->clBot, pStructDiscord->uChanId, pStructDiscord->chMsg);
+	string strMsg = pStructDiscord->chMsg;
 
+	if (strMsg.find(":warning:") == string::npos)
+	{
+		if (pStructDiscord->bShowCountry
+			&& !g_SteamWebAPI.GetAPIKey().empty())
+		{
+			string strName = "";
+			string strCountry = "";
+
+			int iFind = strMsg.find_first_of("`");
+
+			if (iFind != string::npos)
+			{
+				for (int i = (iFind + 1); i < strMsg.length(); i++)
+				{
+					if (strMsg[i] == '`')
+						break;
+
+					strName += strMsg[i];
+				}
+			}
+
+			strCountry = g_SteamWebAPI.GetSteamProfileCountry(g_ServerAPI.GetSteamIdByPlayerName(strName));
+
+			if (!strCountry.empty())
+			{
+				int iErase = 0;
+
+				if (strMsg.find(":speech_balloon:") != string::npos)
+					iErase = 16;
+				else if (strMsg.find(":thumbsup:") != string::npos)
+					iErase = 10;
+				else if (strMsg.find(":thumbsdown:") != string::npos)
+					iErase = 12;
+
+				strMsg.erase(0, iErase);
+				strMsg.insert(0, (":flag_" + g_Utils.ToLowerCase(strCountry) + ":"));
+			}
+		}
+	}
+
+	g_DiscordAPI.SendBotMessage(pStructDiscord->clBot, pStructDiscord->uChanId, strMsg);
 	return NULL;
 }
 
 void CreateAsyncMessage(const char* chMsg)
 {
 	structDiscord stDiscord = { };
 
+	stDiscord.bShowCountry = true;
 	stDiscord.clBot = g_DiscordAPI.clBot;
 	stDiscord.uChanId = g_Vars.uChannelId;
 
@@ -34,7 +77,7 @@ void CreateAsyncMessage(const char* chMsg)
 	CloseHandle(hThread);
 }
 
-const char* UnknownFuncHook(const char* chStr1, const char* chStr2, int iSize)
+const char* __cdecl UnknownFuncHook(const char* chStr1, const char* chStr2, int iSize)
 {
 	if (chStr1[0] == 2)
 	{
@@ -64,7 +107,7 @@ const char* UnknownFuncHook(const char* chStr1, const char* chStr2, int iSize)
 	return OrigUnknownFunc(chStr1, chStr2, iSize);
 }
 
-int UnknownFuncHook2(int a1, const char* a2, const char* chPlayerName)
+int __cdecl UnknownFuncHook2(int a1, const char* a2, const char* chPlayerName)
 {
 	if (strstr(a2, "has joined the game")
 		|| strstr(a2, "has left the game"))
@@ -88,7 +131,7 @@ int UnknownFuncHook2(int a1, const char* a2, const char* chPlayerName)
 	return OrigUnknownFunc2(a1, a2, chPlayerName);
 }
 
-int UnknownFuncHook3(const char* chText, const char* chCvar, const char* chValue)
+int __cdecl UnknownFuncHook3(const char* chText, const char* chCvar, const char* chValue)
 {
 	if (strstr(chText, "changed to"))
 	{
@@ -162,16 +205,17 @@ void ListenCommands()
 	clBot.start(st_wait);
 }
 
-bool Initialization(HMODULE hModule)
+void Initialization(HMODULE hModule)
 {
 	if (!hModule)
-		return false;
+		return;
 
 	HMODULE hEngine = GetModuleHandleA("hw.dll");
 	HMODULE hServer = GetModuleHandleA("server.dll");
 
 	g_Vars.strToken = g_Utils.GetRegValueString(HKEY_CURRENT_USER, "SOFTWARE\\SvenJector", "Token");
 	g_Vars.strChannelId = g_Utils.GetRegValueString(HKEY_CURRENT_USER, "SOFTWARE\\SvenJector", "ChannelID");
+	g_Vars.strSteamAPIKey = g_Utils.GetRegValueString(HKEY_CURRENT_USER, "SOFTWARE\\SvenJector", "SteamAPI");
 
 	if (!g_Vars.strChannelId.empty())
 		g_Vars.uChannelId = _atoi64(g_Vars.strChannelId.c_str());
@@ -181,6 +225,7 @@ bool Initialization(HMODULE hModule)
 		&& g_Vars.uChannelId != NULL)
 	{
 		g_ServerAPI.Initialization(hServer);
+		g_SteamWebAPI.SetAPIKey(g_Vars.strSteamAPIKey);
 
 		OrigUnknownFunc = (UnknownFuncFn)DetourFunction((PBYTE)((DWORD)hServer + 0x0D6EB0), (PBYTE)UnknownFuncHook);
 		OrigUnknownFunc2 = (UnknownFuncFn2)DetourFunction((PBYTE)((DWORD)hServer + 0x13DA80), (PBYTE)UnknownFuncHook2);

SvenDPP/SvenDPP/Include.h

@@ -9,6 +9,7 @@
 #include <iostream>
 #include <dpp/dpp.h>
 #include <Windows.h>
+#include <wininet.h>
 #include <algorithm>
 
 using namespace std;
@@ -31,9 +32,11 @@ typedef int(__cdecl* UnknownFuncFn3)(const char* chText, const char* chCvar, con
 #include "Console.h"
 #include "ServerAPI.h"
 #include "DiscordAPI.h"
+#include "SteamWebAPI.h"
 
 extern CVars g_Vars;
 extern CUtils g_Utils;
 extern CConsole g_Console;
 extern CServerAPI g_ServerAPI;
-extern CDiscordAPI g_DiscordAPI;
+extern CDiscordAPI g_DiscordAPI;
+extern CSteamWebAPI g_SteamWebAPI;

SvenDPP/SvenDPP/ServerAPI.cpp

@@ -13,6 +13,16 @@ void CServerAPI::ClientPrintAll(string strMsg)
 	pServerFuncs->pfnMessageEnd();
 }
 
+string CServerAPI::GetSteamIdByPlayerName(string strName)
+{
+	edict_t* pEdict = g_ServerAPI.pServerFuncs->pfnFindEntityByString(NULL, "netname", strName.c_str());
+
+	if (pEdict != NULL)
+		return g_ServerAPI.pServerFuncs->pfnGetPlayerAuthId(pEdict);
+
+	return "";
+}
+
 enginefuncs_s* CServerAPI::Initialization(HMODULE hServer)
 {
 	pServerFuncs = (enginefuncs_t*)((DWORD)hServer + 0x563C80);

SvenDPP/SvenDPP/ServerAPI.h

@@ -5,6 +5,7 @@ class CServerAPI
 public:
 	void Execute(string strCommand);
 	void ClientPrintAll(string strMsg);
+	string GetSteamIdByPlayerName(string strName);
 	enginefuncs_s* Initialization(HMODULE hServer);
 	void SetVariable(string strCVar, string strValue);
 	void RegisterVariable(string strName, string strDefValue);

SvenDPP/SvenDPP/SteamWebAPI.cpp

@@ -0,0 +1,29 @@
+#include "Include.h"
+
+string CSteamWebAPI::GetAPIKey()
+{
+	return strAPIKey;
+}
+
+void CSteamWebAPI::SetAPIKey(string strValue)
+{
+	strAPIKey = strValue;
+}
+
+string CSteamWebAPI::GetSteamProfileCountry(string strSteamId)
+{
+	if (!strSteamId.empty())
+	{
+		UINT64 uSteamId64 = g_Utils.ToSteamID64(strSteamId);
+
+		if (uSteamId64 > 0)
+		{
+			string strCountryCode = g_Utils.Parse("loccountrycode", g_Utils.SendGETRequest("api.steampowered.com", ("/ISteamUser/GetPlayerSummaries/v0002/?key=" + strAPIKey + "&steamids=" + to_string(uSteamId64))));
+
+			if (!strCountryCode.empty())
+				return strCountryCode;
+		}
+	}
+
+	return "";
+}

SvenDPP/SvenDPP/SteamWebAPI.h

@@ -0,0 +1,12 @@
+#pragma once
+
+class CSteamWebAPI
+{
+public:
+	string GetAPIKey();
+	void SetAPIKey(string strValue);
+	string GetSteamProfileCountry(string strSteamId);
+
+private:
+	string strAPIKey = "";
+};

SvenDPP/SvenDPP/SvenDPP.vcxproj

@@ -23,6 +23,7 @@
     <ClCompile Include="DiscordAPI.cpp" />
     <ClCompile Include="DllMain.cpp" />
     <ClCompile Include="ServerAPI.cpp" />
+    <ClCompile Include="SteamWebAPI.cpp" />
     <ClCompile Include="Utils.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -31,6 +32,7 @@
     <ClInclude Include="Include.h" />
     <ClInclude Include="SDK\Structs.h" />
     <ClInclude Include="ServerAPI.h" />
+    <ClInclude Include="SteamWebAPI.h" />
     <ClInclude Include="Utils.h" />
     <ClInclude Include="Vars.h" />
   </ItemGroup>
@@ -88,8 +90,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\Users\User\Desktop\Random\SvenJect + SvenDPP\v0.4\SvenDPP\SvenDPP\DPP\include\dpp-10.0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Users\User\Desktop\Random\SvenJect + SvenDPP\v0.4\SvenDPP\SvenDPP\DPP\lib\dpp-10.0;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -124,7 +126,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dpp.lib;WinInet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>

SvenDPP/SvenDPP/SvenDPP.vcxproj.filters

@@ -16,6 +16,9 @@
     <ClCompile Include="ServerAPI.cpp">
       <Filter>CPP</Filter>
     </ClCompile>
+    <ClCompile Include="SteamWebAPI.cpp">
+      <Filter>CPP</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Console.h">
@@ -39,6 +42,9 @@
     <ClInclude Include="ServerAPI.h">
       <Filter>H</Filter>
     </ClInclude>
+    <ClInclude Include="SteamWebAPI.h">
+      <Filter>H</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CPP">

SvenDPP/SvenDPP/Utils.cpp

@@ -53,6 +53,39 @@ string CUtils::ToLowerCase(string strText)
 	return strText;
 }
 
+UINT64 CUtils::ToSteamID64(string strSteamId)
+{
+	if (strSteamId.find_last_of(":") != string::npos)
+		return (((stoull(strSteamId.erase(0, (strSteamId.find_last_of(":") + 1))) << 1) | 0x0110000100000000ULL) + 1);
+
+	return NULL;
+}
+
+string CUtils::Parse(string strValue, string strText)
+{
+	int iReadFrom = 0;
+	string strOutput = "";
+
+	if (strValue.empty()
+		|| strText.empty())
+		return strOutput;
+
+	iReadFrom = strText.find(strValue);
+
+	if (iReadFrom == string::npos)
+		return strOutput;
+
+	for (int i = (iReadFrom + strValue.length() + 3); i < strText.length(); i++)
+	{
+		if (strText[i] == 34)
+			break;
+
+		strOutput += strText[i];
+	}
+
+	return strOutput;
+}
+
 vector<string> CUtils::GetArguments(string strCommand)
 {
 	int iArg = 0;
@@ -97,6 +130,45 @@ int CUtils::IsWhiteSpace(string strText, int iStart, int iEnd)
 	return 1;
 }
 
+string CUtils::SendGETRequest(string strServerName, string strGETRequest)
+{
+	string strResult = "";
+
+	HINTERNET hOpen = NULL;
+	HINTERNET hConnect = NULL;
+	HINTERNET hRequest = NULL;
+
+	hOpen = InternetOpenA(NULL, NULL, NULL, NULL, NULL);
+
+	if (hOpen)
+	{
+		hConnect = InternetConnectA(hOpen, strServerName.c_str(), INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, NULL, NULL);
+
+		if (hConnect)
+		{
+			hRequest = HttpOpenRequestA(hConnect, "GET", strGETRequest.c_str(), NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, NULL);
+
+			if (hRequest)
+			{
+				if (HttpSendRequestA(hRequest, NULL, NULL, NULL, NULL))
+				{
+					char chResult[4096];
+					DWORD dwBytes = NULL;
+
+					if (InternetReadFile(hRequest, chResult, sizeof(chResult), &dwBytes))
+						strResult = chResult;
+				}
+			}
+		}
+	}
+
+	InternetCloseHandle(hOpen);
+	InternetCloseHandle(hConnect);
+	InternetCloseHandle(hRequest);
+
+	return strResult;
+}
+
 string CUtils::GetRegValueString(HKEY hKey, string strSubKey, string strValue)
 {
 	char chValue[500];

SvenDPP/SvenDPP/Utils.h

@@ -8,8 +8,11 @@ class CUtils
 	int ArgCount(string strCommand);
 	int ArgCount(vector<string> strArgs);
 	string ToLowerCase(string strText);
+	UINT64 ToSteamID64(string strSteamId);
+	string Parse(string strValue, string strText);
 	vector<string> GetArguments(string strCommand);
 	int IsWhiteSpace(string strText, int iStart, int iEnd);
+	string SendGETRequest(string strServerName, string strGETRequest);
 	string GetRegValueString(HKEY hKey, string strSubKey, string strValue);
 	bool SetRegValue(HKEY hKey, string strSubKey, string strKeyName, string strValue);
 };

SvenDPP/SvenDPP/Vars.h

@@ -5,6 +5,7 @@ class CVars
 public:
 	string strToken = "";
 	string strChannelId = "";
-
 	ULONG64 uChannelId = NULL;
+
+	string strSteamAPIKey = "";
 };