Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

3 files changed, 178 insertions, 5 deletions

diff --git a/logic/updater/DownloadUpdateTask.cpp b/logic/updater/DownloadUpdateTask.cpp
index 6e0a92f0..029286dd 100644
--- a/logic/updater/DownloadUpdateTask.cpp
+++ b/logic/updater/DownloadUpdateTask.cpp
@@ -404,11 +404,10 @@ DownloadUpdateTask::processFileLists(NetJob *job,
 				{
 					auto cache_entry = MMC->metacache()->resolveEntry("root", entry.path);
 					QLOG_DEBUG() << "Updater will be in " << cache_entry->getFullPath();
-					if(cache_entry->stale)
-					{
-						auto download = CacheDownload::make(QUrl(source.url), cache_entry);
-						job->addNetAction(download);
-					}
+					// force check.
+					cache_entry->stale = true;
+					auto download = CacheDownload::make(QUrl(source.url), cache_entry);
+					job->addNetAction(download);
 				}
 				else
 				{
diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp
new file mode 100644
index 00000000..40367eac
--- /dev/null
+++ b/logic/updater/NotificationChecker.cpp
@@ -0,0 +1,120 @@
+#include "NotificationChecker.h"
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+
+#include "MultiMC.h"
+#include "logic/net/CacheDownload.h"
+#include "config.h"
+
+NotificationChecker::NotificationChecker(QObject *parent)
+	: QObject(parent), m_notificationsUrl(QUrl(NOTIFICATION_URL))
+{
+	// this will call checkForNotifications once the event loop is running
+	QMetaObject::invokeMethod(this, "checkForNotifications", Qt::QueuedConnection);
+}
+
+QUrl NotificationChecker::notificationsUrl() const
+{
+	return m_notificationsUrl;
+}
+void NotificationChecker::setNotificationsUrl(const QUrl &notificationsUrl)
+{
+	m_notificationsUrl = notificationsUrl;
+}
+
+QList<NotificationChecker::NotificationEntry> NotificationChecker::notificationEntries() const
+{
+	return m_entries;
+}
+
+void NotificationChecker::checkForNotifications()
+{
+	if (!m_notificationsUrl.isValid())
+	{
+		QLOG_ERROR() << "Failed to check for notifications. No notifications URL set."
+					 << "If you'd like to use MultiMC's notification system, please pass the "
+						"URL to CMake at compile time.";
+		return;
+	}
+	if (m_checkJob)
+	{
+		return;
+	}
+	m_checkJob.reset(new NetJob("Checking for notifications"));
+	auto entry = MMC->metacache()->resolveEntry("root", "notifications.json");
+	entry->stale = true;
+	m_checkJob->addNetAction(m_download = CacheDownload::make(m_notificationsUrl, entry));
+	connect(m_download.get(), &CacheDownload::succeeded, this,
+			&NotificationChecker::downloadSucceeded);
+	m_checkJob->start();
+}
+
+void NotificationChecker::downloadSucceeded(int)
+{
+	m_entries.clear();
+
+	QFile file(m_download->m_output_file.fileName());
+	if (file.open(QFile::ReadOnly))
+	{
+		QJsonArray root = QJsonDocument::fromJson(file.readAll()).array();
+		for (auto it = root.begin(); it != root.end(); ++it)
+		{
+			QJsonObject obj = (*it).toObject();
+			NotificationEntry entry;
+			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.from = obj.value("from").toString();
+			entry.to = obj.value("to").toString();
+			const QString type = obj.value("type").toString("critical");
+			if (type == "critical")
+			{
+				entry.type = NotificationEntry::Critical;
+			}
+			else if (type == "warning")
+			{
+				entry.type = NotificationEntry::Warning;
+			}
+			else if (type == "information")
+			{
+				entry.type = NotificationEntry::Information;
+			}
+			m_entries.append(entry);
+		}
+	}
+
+	m_checkJob.reset();
+
+	emit notificationCheckFinished();
+}
+
+bool NotificationChecker::NotificationEntry::applies() const
+{
+	bool channelApplies = channel.isEmpty() || channel == VERSION_CHANNEL;
+	bool buildtypeApplies = buildtype.isEmpty() || buildtype == VERSION_BUILD_TYPE;
+	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;
+}
+
+bool NotificationChecker::NotificationEntry::versionLessThan(const QString &v1,
+															 const QString &v2)
+{
+	QStringList l1 = v1.split('.');
+	QStringList l2 = v2.split('.');
+	while (!l1.isEmpty() && !l2.isEmpty())
+	{
+		int one = l1.isEmpty() ? 0 : l1.takeFirst().toInt();
+		int two = l2.isEmpty() ? 0 : l2.takeFirst().toInt();
+		if (one != two)
+		{
+			return one < two;
+		}
+	}
+	return false;
+}
diff --git a/logic/updater/NotificationChecker.h b/logic/updater/NotificationChecker.h
new file mode 100644
index 00000000..20541757
--- /dev/null
+++ b/logic/updater/NotificationChecker.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <QObject>
+
+#include "logic/net/NetJob.h"
+#include "logic/net/CacheDownload.h"
+
+class NotificationChecker : public QObject
+{
+	Q_OBJECT
+
+public:
+	explicit NotificationChecker(QObject *parent = 0);
+
+	QUrl notificationsUrl() const;
+	void setNotificationsUrl(const QUrl &notificationsUrl);
+
+	struct NotificationEntry
+	{
+		int id;
+		QString message;
+		enum
+		{
+			Critical,
+			Warning,
+			Information
+		} type;
+		QString channel;
+		QString buildtype;
+		QString from;
+		QString to;
+		bool applies() const;
+		static bool versionLessThan(const QString &v1, const QString &v2);
+	};
+
+	QList<NotificationEntry> notificationEntries() const;
+
+public
+slots:
+	void checkForNotifications();
+
+private
+slots:
+	void downloadSucceeded(int);
+
+signals:
+	void notificationCheckFinished();
+
+private:
+	QList<NotificationEntry> m_entries;
+	QUrl m_notificationsUrl;
+	NetJobPtr m_checkJob;
+	CacheDownloadPtr m_download;
+};