Merge branch 'release-0.1'

Release MultiMC version 0.1.

3 files changed, 9 insertions, 8 deletions

diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp
index 40367eac..b2d67632 100644
--- a/logic/updater/NotificationChecker.cpp
+++ b/logic/updater/NotificationChecker.cpp
@@ -5,8 +5,8 @@
 #include <QJsonArray>
 
 #include "MultiMC.h"
+#include "MultiMCVersion.h"
 #include "logic/net/CacheDownload.h"
-#include "config.h"
 
 NotificationChecker::NotificationChecker(QObject *parent)
 	: QObject(parent), m_notificationsUrl(QUrl(NOTIFICATION_URL))
@@ -66,7 +66,7 @@ void NotificationChecker::downloadSucceeded(int)
 			entry.id = obj.value("id").toDouble();
 			entry.message = obj.value("message").toString();
 			entry.channel = obj.value("channel").toString();
-			entry.buildtype = obj.value("buildtype").toString();
+			entry.platform = obj.value("platform").toString();
 			entry.from = obj.value("from").toString();
 			entry.to = obj.value("to").toString();
 			const QString type = obj.value("type").toString("critical");
@@ -93,13 +93,14 @@ void NotificationChecker::downloadSucceeded(int)
 
 bool NotificationChecker::NotificationEntry::applies() const
 {
-	bool channelApplies = channel.isEmpty() || channel == VERSION_CHANNEL;
-	bool buildtypeApplies = buildtype.isEmpty() || buildtype == VERSION_BUILD_TYPE;
+	MultiMCVersion version = MMC->version();
+	bool channelApplies = channel.isEmpty() || channel == version.channel;
+	bool platformApplies = platform.isEmpty() || platform == version.platform;
 	bool fromApplies =
 		from.isEmpty() || from == FULL_VERSION_STR || !versionLessThan(FULL_VERSION_STR, from);
 	bool toApplies =
 		to.isEmpty() || to == FULL_VERSION_STR || !versionLessThan(to, FULL_VERSION_STR);
-	return channelApplies && buildtypeApplies && fromApplies && toApplies;
+	return channelApplies && platformApplies && fromApplies && toApplies;
 }
 
 bool NotificationChecker::NotificationEntry::versionLessThan(const QString &v1,
diff --git a/logic/updater/NotificationChecker.h b/logic/updater/NotificationChecker.h
index 20541757..915ee54d 100644
--- a/logic/updater/NotificationChecker.h
+++ b/logic/updater/NotificationChecker.h
@@ -26,7 +26,7 @@ public:
 			Information
 		} type;
 		QString channel;
-		QString buildtype;
+		QString platform;
 		QString from;
 		QString to;
 		bool applies() const;
diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp
index 489e7769..8a280dd1 100644
--- a/logic/updater/UpdateChecker.cpp
+++ b/logic/updater/UpdateChecker.cpp
@@ -142,8 +142,6 @@ void UpdateChecker::updateCheckFinished(bool notifyNoUpdate)
 		if (newestVersion.value("Id").toVariant().toInt() <
 			version.value("Id").toVariant().toInt())
 		{
-			QLOG_DEBUG() << "Found newer version with ID"
-						 << version.value("Id").toVariant().toInt();
 			newestVersion = version;
 		}
 	}
@@ -153,6 +151,7 @@ void UpdateChecker::updateCheckFinished(bool notifyNoUpdate)
 	int newBuildNumber = newestVersion.value("Id").toVariant().toInt();
 	if (newBuildNumber != MMC->version().build)
 	{
+		QLOG_DEBUG() << "Found newer version with ID" << newBuildNumber;
 		// Update!
 		emit updateAvailable(m_repoUrl, newestVersion.value("Name").toVariant().toString(),
 							 newBuildNumber);
@@ -262,3 +261,4 @@ void UpdateChecker::chanListDownloadFailed()
 	QLOG_ERROR() << "Failed to download channel list.";
 	emit channelListLoaded();
 }
+