Merge pull request #144 from mxve/versioncheck

Fix GitHub version check
iw4x · Sep 28, 2024 · 68bf9e5 · 68bf9e5
2 parents 717ae61 + ac72a80
commit 68bf9e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/Components/Modules/Updater.cpp b/src/Components/Modules/Updater.cpp
@@ -2,6 +2,7 @@
 
 #include "Updater.hpp"
 #include "Scheduler.hpp"
+#include "version.hpp"
 
 #include <Utils/WebIO.hpp>
 
@@ -13,21 +14,11 @@ namespace Components
 	{
 		const Game::dvar_t* cl_updateAvailable;
 
-		// If they use the alterware-launcher once to install they will have this file
-		// If they don't, what are they waiting for?
-		constexpr auto* REVISION_FILE = ".iw4xrevision";
 		constexpr auto* GITHUB_REMOTE_URL = "https://api.github.com/repos/iw4x/iw4x-client/releases/latest";
 		constexpr auto* INSTALL_GUIDE_REMOTE_URL = "https://forum.alterware.dev/t/how-to-install-the-alterware-launcher/56";
 
 		void CheckForUpdate()
 		{
-			std::string revision;
-			if (!Utils::IO::ReadFile(REVISION_FILE, &revision) || revision.empty())
-			{
-				Logger::Print("{} does not exist. Notifying the user an update is available\n", REVISION_FILE);
-				Game::Dvar_SetBool(cl_updateAvailable, true);
-			}
-
 			const auto result = Utils::WebIO("IW4x", GITHUB_REMOTE_URL).setTimeout(5000)->get();
 			if (result.empty())
 			{
@@ -52,8 +43,8 @@ namespace Components
 				return;
 			}
 
-			const auto* tag = doc["tag_name"].GetString();
-			if (revision != tag)
+			const std::string tag = doc["tag_name"].GetString();
+			if (REVISION_STR != tag)
 			{
 				// A new version came out!
 				Game::Dvar_SetBool(cl_updateAvailable, true);

diff --git a/src/Utils/WebIO.cpp b/src/Utils/WebIO.cpp
@@ -259,7 +259,7 @@ namespace Utils
 		if (success) *success = false;
 		if (!this->openConnection()) return {};
 
-		static const char* acceptTypes[] = { "application/x-www-form-urlencoded", nullptr };
+		static const char* acceptTypes[] = { "application/x-www-form-urlencoded", "application/json", nullptr };
 
 		DWORD dwFlag = INTERNET_FLAG_RELOAD | (this->isSecuredConnection() ? INTERNET_FLAG_SECURE : 0);
 
@@ -298,7 +298,7 @@ namespace Utils
 
 		DWORD statusCode = 404;
 		DWORD length = sizeof(statusCode);
-		if (HttpQueryInfoA(this->hFile_, HTTP_QUERY_FLAG_NUMBER | HTTP_QUERY_STATUS_CODE, &statusCode, &length, nullptr) == FALSE || (statusCode != 200 && statusCode != 201))
+		if (HttpQueryInfoA(this->hFile_, HTTP_QUERY_FLAG_NUMBER | HTTP_QUERY_STATUS_CODE, &statusCode, &length, nullptr) == FALSE || (statusCode != 200 && statusCode != 201 && statusCode != 304))
 		{
 			this->closeConnection();
 			return {};