NOISSUE Specify Imgur client ID at build time

5 files changed, 11 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcf931c0..5e3d6cea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,9 @@ set(MultiMC_META_URL "https://meta.multimc.org/v1/" CACHE STRING "URL to fetch M
 # paste.ee API key
 set(MultiMC_PASTE_EE_API_KEY "utLvciUouSURFzfjPxLBf5W4ISsUX4pwBDF7N1AfZ" CACHE STRING "API key you can get from paste.ee when you register an account")
 
+# Imgur API Client ID
+set(MultiMC_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
+
 # Google analytics ID
 set(MultiMC_ANALYTICS_ID "UA-87731965-2" CACHE STRING "ID you can get from Google analytics")
 
diff --git a/api/logic/screenshots/ImgurAlbumCreation.cpp b/api/logic/screenshots/ImgurAlbumCreation.cpp
index 07ae6fe1..1f195f00 100644
--- a/api/logic/screenshots/ImgurAlbumCreation.cpp
+++ b/api/logic/screenshots/ImgurAlbumCreation.cpp
@@ -22,7 +22,7 @@ void ImgurAlbumCreation::start()
     QNetworkRequest request(m_url);
     request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT_UNCACHED);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
+    request.setRawHeader("Authorization", QString("Client-ID %1").arg(BuildConfig.IMGUR_CLIENT_ID).toStdString().c_str());
     request.setRawHeader("Accept", "application/json");
 
     QStringList hashes;
diff --git a/api/logic/screenshots/ImgurUpload.cpp b/api/logic/screenshots/ImgurUpload.cpp
index 062c589f..7e95d5ca 100644
--- a/api/logic/screenshots/ImgurUpload.cpp
+++ b/api/logic/screenshots/ImgurUpload.cpp
@@ -24,7 +24,7 @@ void ImgurUpload::start()
     m_status = Job_InProgress;
     QNetworkRequest request(m_url);
     request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT_UNCACHED);
-    request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
+    request.setRawHeader("Authorization", QString("Client-ID %1").arg(BuildConfig.IMGUR_CLIENT_ID).toStdString().c_str());
     request.setRawHeader("Accept", "application/json");
 
     QFile f(m_shot->m_file.absoluteFilePath());
diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
index 577bdcb2..60d417a6 100644
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -33,6 +33,7 @@ Config::Config()
     VERSION_STR = "@MultiMC_VERSION_STRING@";
     NEWS_RSS_URL = "@MultiMC_NEWS_RSS_URL@";
     PASTE_EE_KEY = "@MultiMC_PASTE_EE_API_KEY@";
+    IMGUR_CLIENT_ID = "@MultiMC_IMGUR_CLIENT_ID@";
     META_URL = "@MultiMC_META_URL@";
 
     BUG_TRACKER_URL = "@MultiMC_BUG_TRACKER_URL@";
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index 07d7a23a..185bebad 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -66,6 +66,11 @@ public:
     QString PASTE_EE_KEY;
 
     /**
+     * Client ID you can get from Imgur when you register an application
+     */
+    QString IMGUR_CLIENT_ID;
+
+    /**
      * MultiMC Metadata repository URL prefix
      */
     QString META_URL;