Merge branch 'PolyMC:develop' into feature/download_mods

29 files changed, 229 insertions, 706 deletions

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index a3e2c44f..b605e54b 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -14,7 +14,7 @@
 #include "ui/pages/global/ProxyPage.h"
 #include "ui/pages/global/ExternalToolsPage.h"
 #include "ui/pages/global/AccountListPage.h"
-#include "ui/pages/global/PasteEEPage.h"
+#include "ui/pages/global/PastePage.h"
 #include "ui/pages/global/CustomCommandsPage.h"
 
 #include "ui/themes/ITheme.h"
@@ -595,7 +595,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("AutoUpdate", true);
 
         // Theming
-        m_settings->registerSetting("IconTheme", QString("multimc"));
+        m_settings->registerSetting("IconTheme", QString("pe_colored"));
         m_settings->registerSetting("ApplicationTheme", QString("system"));
 
         // Notifications
@@ -662,7 +662,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         // Memory
         m_settings->registerSetting({"MinMemAlloc", "MinMemoryAlloc"}, 512);
-        m_settings->registerSetting({"MaxMemAlloc", "MaxMemoryAlloc"}, 1024);
+        m_settings->registerSetting({"MaxMemAlloc", "MaxMemoryAlloc"}, 4096);
         m_settings->registerSetting("PermGen", 128);
 
         // Java Settings
@@ -714,8 +714,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
         m_settings->registerSetting("UpdateDialogGeometry", "");
 
-        // paste.ee API key
-        m_settings->registerSetting("PasteEEAPIKey", "multimc");
+        // pastebin URL
+        m_settings->registerSetting("PastebinURL", "https://0x0.st");
 
         // Init page provider
         {
@@ -728,7 +728,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
             m_globalSettingsProvider->addPage<ProxyPage>();
             m_globalSettingsProvider->addPage<ExternalToolsPage>();
             m_globalSettingsProvider->addPage<AccountListPage>();
-            m_globalSettingsProvider->addPage<PasteEEPage>();
+            m_globalSettingsProvider->addPage<PastePage>();
         }
         qDebug() << "<> Settings loaded.";
     }
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index a1aae524..8d8b4d02 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -181,15 +181,6 @@ set(NOTIFICATIONS_SOURCES
     notifications/NotificationChecker.cpp
 )
 
-# Backend for the news bar... there's usually no news.
-set(NEWS_SOURCES
-    # News System
-    news/NewsChecker.h
-    news/NewsChecker.cpp
-    news/NewsEntry.h
-    news/NewsEntry.cpp
-)
-
 # Icon interface
 set(ICONS_SOURCES
     # Icons System and related code
@@ -719,8 +710,8 @@ SET(LAUNCHER_SOURCES
     ui/pages/global/LauncherPage.h
     ui/pages/global/ProxyPage.cpp
     ui/pages/global/ProxyPage.h
-    ui/pages/global/PasteEEPage.cpp
-    ui/pages/global/PasteEEPage.h
+    ui/pages/global/PastePage.cpp
+    ui/pages/global/PastePage.h
 
     # GUI - platform pages
     ui/pages/modplatform/VanillaPage.cpp
@@ -865,7 +856,7 @@ qt5_wrap_ui(LAUNCHER_UI
     ui/pages/global/AccountListPage.ui
     ui/pages/global/JavaPage.ui
     ui/pages/global/LauncherPage.ui
-    ui/pages/global/PasteEEPage.ui
+    ui/pages/global/PastePage.ui
     ui/pages/global/ProxyPage.ui
     ui/pages/global/MinecraftPage.ui
     ui/pages/global/ExternalToolsPage.ui
diff --git a/launcher/Launcher.in b/launcher/Launcher.in
index b79b276b..5e5e2c2b 100755
--- a/launcher/Launcher.in
+++ b/launcher/Launcher.in
@@ -14,7 +14,7 @@ if [[ $EUID -eq 0 ]]; then
 fi
 
 
-LAUNCHER_NAME=@Launcher_Name@
+LAUNCHER_NAME=@Launcher_APP_BINARY_NAME@
 LAUNCHER_DIR="$(dirname "$(readlink -f "$0")")"
 echo "Launcher Dir: ${LAUNCHER_DIR}"
 
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index 80c599cc..35ddc35c 100644
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
@@ -103,11 +103,15 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     for(QString line : lines)
     {
         line = line.trimmed();
+        // NOTE: workaround for GH-4125, where garbage is getting printed into stdout on bedrock linux
+        if (line.contains("/bedrock/strata")) {
+            continue;
+        }
 
         auto parts = line.split('=', QString::SkipEmptyParts);
         if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
         {
-            success = false;
+            continue;
         }
         else
         {
diff --git a/launcher/minecraft/auth/AuthRequest.cpp b/launcher/minecraft/auth/AuthRequest.cpp
index 459d2354..feface80 100644
--- a/launcher/minecraft/auth/AuthRequest.cpp
+++ b/launcher/minecraft/auth/AuthRequest.cpp
@@ -44,7 +44,7 @@ void AuthRequest::onRequestFinished() {
     if (reply_ != qobject_cast<QNetworkReply *>(sender())) {
         return;
     }
-    httpStatus_ = 200;
+    httpStatus_ = reply_->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
     finish();
 }
 
diff --git a/launcher/minecraft/auth/Parsers.cpp b/launcher/minecraft/auth/Parsers.cpp
index ed31e934..2dd36562 100644
--- a/launcher/minecraft/auth/Parsers.cpp
+++ b/launcher/minecraft/auth/Parsers.cpp
@@ -94,7 +94,7 @@ bool parseXTokenResponse(QByteArray & data, Katabasis::Token &output, QString na
         return false;
     }
     if(!getString(obj.value("Token"), output.token)) {
-        qWarning() << "User Token is not a timestamp";
+        qWarning() << "User Token is not a string";
         return false;
     }
     auto arrayVal = obj.value("DisplayClaims").toObject().value("xui");
diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
index 9fef99b0..add91659 100644
--- a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
+++ b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp
@@ -56,6 +56,14 @@ void MinecraftProfileStep::onRequestDone(
         return;
     }
     if (error != QNetworkReply::NoError) {
+        qWarning() << "Error getting profile:";
+        qWarning() << " HTTP Status:        " << requestor->httpStatus_;
+        qWarning() << " Internal error no.: " << error;
+        qWarning() << " Error string:       " << requestor->errorString_;
+
+        qWarning() << " Response:";
+        qWarning() << QString::fromUtf8(data);
+
         emit finished(
             AccountTaskState::STATE_FAILED_SOFT,
             tr("Minecraft Java profile acquisition failed.")
diff --git a/launcher/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp
index 4b69b68a..52b82a0e 100644
--- a/launcher/net/PasteUpload.cpp
+++ b/launcher/net/PasteUpload.cpp
@@ -8,44 +8,34 @@
 #include <QJsonDocument>
 #include <QFile>
 
-PasteUpload::PasteUpload(QWidget *window, QString text, QString key) : m_window(window)
+PasteUpload::PasteUpload(QWidget *window, QString text, QString url) : m_window(window), m_uploadUrl(url), m_text(text.toUtf8())
 {
-    m_key = key;
-    QByteArray temp;
-    QJsonObject topLevelObj;
-    QJsonObject sectionObject;
-    sectionObject.insert("contents", text);
-    QJsonArray sectionArray;
-    sectionArray.append(sectionObject);
-    topLevelObj.insert("description", "Log Upload");
-    topLevelObj.insert("sections", sectionArray);
-    QJsonDocument docOut;
-    docOut.setObject(topLevelObj);
-    m_jsonContent = docOut.toJson();
 }
 
 PasteUpload::~PasteUpload()
 {
 }
 
-bool PasteUpload::validateText()
-{
-    return m_jsonContent.size() <= maxSize();
-}
-
 void PasteUpload::executeTask()
 {
-    QNetworkRequest request(QUrl("https://api.paste.ee/v1/pastes"));
+    QNetworkRequest request{QUrl(m_uploadUrl)};
     request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT_UNCACHED);
 
-    request.setRawHeader("Content-Type", "application/json");
-    request.setRawHeader("Content-Length", QByteArray::number(m_jsonContent.size()));
-    request.setRawHeader("X-Auth-Token", m_key.toStdString().c_str());
+    QHttpMultiPart *multiPart = new QHttpMultiPart{QHttpMultiPart::FormDataType};
+
+    QHttpPart filePart;
+    filePart.setBody(m_text);
+    filePart.setHeader(QNetworkRequest::ContentTypeHeader, "text/plain");
+    filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"file\"; filename=\"log.txt\"");
 
-    QNetworkReply *rep = APPLICATION->network()->post(request, m_jsonContent);
+    multiPart->append(filePart);
+
+    QNetworkReply *rep = APPLICATION->network()->post(request, multiPart);
+    multiPart->setParent(rep);
 
     m_reply = std::shared_ptr<QNetworkReply>(rep);
-    setStatus(tr("Uploading to paste.ee"));
+    setStatus(tr("Uploading to %1").arg(m_uploadUrl));
+
     connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress);
     connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError)));
     connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished()));
@@ -61,45 +51,23 @@ void PasteUpload::downloadError(QNetworkReply::NetworkError error)
 void PasteUpload::downloadFinished()
 {
     QByteArray data = m_reply->readAll();
-    // if the download succeeded
-    if (m_reply->error() == QNetworkReply::NetworkError::NoError)
+    int statusCode = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+
+    if (m_reply->error() != QNetworkReply::NetworkError::NoError)
     {
+        emitFailed(tr("Network error: %1").arg(m_reply->errorString()));
         m_reply.reset();
-        QJsonParseError jsonError;
-        QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-        if (jsonError.error != QJsonParseError::NoError)
-        {
-            emitFailed(jsonError.errorString());
-            return;
-        }
-        if (!parseResult(doc))
-        {
-            emitFailed(tr("paste.ee returned an error. Please consult the logs for more information"));
-            return;
-        }
+        return;
     }
-    // else the download failed
-    else
+    else if (statusCode != 200 && statusCode != 201)
     {
-        emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
+        QString reasonPhrase = m_reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
+        emitFailed(tr("Error: %1 returned unexpected status code %2 %3").arg(m_uploadUrl).arg(statusCode).arg(reasonPhrase));
+        qCritical() << m_uploadUrl << " returned unexpected status code " << statusCode << " with body: " << data;
         m_reply.reset();
         return;
     }
-    emitSucceeded();
-}
 
-bool PasteUpload::parseResult(QJsonDocument doc)
-{
-    auto object = doc.object();
-    auto status = object.value("success").toBool();
-    if (!status)
-    {
-        qCritical() << "paste.ee reported error:" << QString(object.value("error").toString());
-        return false;
-    }
-    m_pasteLink = object.value("link").toString();
-    m_pasteID = object.value("id").toString();
-    qDebug() << m_pasteLink;
-    return true;
+    m_pasteLink = QString::fromUtf8(data).trimmed();
+    emitSucceeded();
 }
-
diff --git a/launcher/net/PasteUpload.h b/launcher/net/PasteUpload.h
index 5514e058..62b2dc36 100644
--- a/launcher/net/PasteUpload.h
+++ b/launcher/net/PasteUpload.h
@@ -8,37 +8,21 @@ class PasteUpload : public Task
 {
     Q_OBJECT
 public:
-    PasteUpload(QWidget *window, QString text, QString key = "public");
+    PasteUpload(QWidget *window, QString text, QString url);
     virtual ~PasteUpload();
 
     QString pasteLink()
     {
         return m_pasteLink;
     }
-    QString pasteID()
-    {
-        return m_pasteID;
-    }
-    int maxSize()
-    {
-        // 2MB for paste.ee - public
-        if(m_key == "public")
-            return 1024*1024*2;
-        // 12MB for paste.ee - with actual key
-        return 1024*1024*12;
-    }
-    bool validateText();
 protected:
     virtual void executeTask();
 
 private:
-    bool parseResult(QJsonDocument doc);
-    QString m_error;
     QWidget *m_window;
-    QString m_pasteID;
     QString m_pasteLink;
-    QString m_key;
-    QByteArray m_jsonContent;
+    QString m_uploadUrl;
+    QByteArray m_text;
     std::shared_ptr<QNetworkReply> m_reply;
 public
 slots:
diff --git a/launcher/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp
deleted file mode 100644
index 4f4359b8..00000000
--- a/launcher/news/NewsChecker.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NewsChecker.h"
-
-#include <QByteArray>
-#include <QDomDocument>
-
-#include <QDebug>
-
-NewsChecker::NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl)
-{
-    m_network = network;
-    m_feedUrl = feedUrl;
-}
-
-void NewsChecker::reloadNews()
-{
-    // Start a netjob to download the RSS feed and call rssDownloadFinished() when it's done.
-    if (isLoadingNews())
-    {
-        qDebug() << "Ignored request to reload news. Currently reloading already.";
-        return;
-    }
-
-    qDebug() << "Reloading news.";
-
-    NetJob* job = new NetJob("News RSS Feed", m_network);
-    job->addNetAction(Net::Download::makeByteArray(m_feedUrl, &newsData));
-    QObject::connect(job, &NetJob::succeeded, this, &NewsChecker::rssDownloadFinished);
-    QObject::connect(job, &NetJob::failed, this, &NewsChecker::rssDownloadFailed);
-    m_newsNetJob.reset(job);
-    job->start();
-}
-
-void NewsChecker::rssDownloadFinished()
-{
-    // Parse the XML file and process the RSS feed entries.
-    qDebug() << "Finished loading RSS feed.";
-
-    m_newsNetJob.reset();
-    QDomDocument doc;
-    {
-        // Stuff to store error info in.
-        QString errorMsg = "Unknown error.";
-        int errorLine = -1;
-        int errorCol = -1;
-
-        // Parse the XML.
-        if (!doc.setContent(newsData, false, &errorMsg, &errorLine, &errorCol))
-        {
-            QString fullErrorMsg = QString("Error parsing RSS feed XML. %s at %d:%d.").arg(errorMsg, errorLine, errorCol);
-            fail(fullErrorMsg);
-            newsData.clear();
-            return;
-        }
-        newsData.clear();
-    }
-
-    // If the parsing succeeded, read it.
-    QDomNodeList items = doc.elementsByTagName("item");
-    m_newsEntries.clear();
-    for (int i = 0; i < items.length(); i++)
-    {
-        QDomElement element = items.at(i).toElement();
-        NewsEntryPtr entry;
-        entry.reset(new NewsEntry());
-        QString errorMsg = "An unknown error occurred.";
-        if (NewsEntry::fromXmlElement(element, entry.get(), &errorMsg))
-        {
-            qDebug() << "Loaded news entry" << entry->title;
-            m_newsEntries.append(entry);
-        }
-        else
-        {
-            qWarning() << "Failed to load news entry at index" << i << ":" << errorMsg;
-        }
-    }
-
-    succeed();
-}
-
-void NewsChecker::rssDownloadFailed(QString reason)
-{
-    // Set an error message and fail.
-    fail(tr("Failed to load news RSS feed:\n%1").arg(reason));
-}
-
-
-QList<NewsEntryPtr> NewsChecker::getNewsEntries() const
-{
-    return m_newsEntries;
-}
-
-bool NewsChecker::isLoadingNews() const
-{
-    return m_newsNetJob.get() != nullptr;
-}
-
-QString NewsChecker::getLastLoadErrorMsg() const
-{
-    return m_lastLoadError;
-}
-
-void NewsChecker::succeed()
-{
-    m_lastLoadError = "";
-    qDebug() << "News loading succeeded.";
-    m_newsNetJob.reset();
-    emit newsLoaded();
-}
-
-void NewsChecker::fail(const QString& errorMsg)
-{
-    m_lastLoadError = errorMsg;
-    qDebug() << "Failed to load news:" << errorMsg;
-    m_newsNetJob.reset();
-    emit newsLoadingFailed(errorMsg);
-}
-
diff --git a/launcher/news/NewsChecker.h b/launcher/news/NewsChecker.h
deleted file mode 100644
index 8467a541..00000000
--- a/launcher/news/NewsChecker.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QList>
-
-#include <net/NetJob.h>
-
-#include "NewsEntry.h"
-
-class NewsChecker : public QObject
-{
-    Q_OBJECT
-public:
-    /*!
-     * Constructs a news reader to read from the given RSS feed URL.
-     */
-    NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl);
-
-    /*!
-     * Returns the error message for the last time the news was loaded.
-     * Empty string if the last load was successful.
-     */
-    QString getLastLoadErrorMsg() const;
-
-    /*!
-     * Returns true if the news has been loaded successfully.
-     */
-    bool isNewsLoaded() const;
-
-    //! True if the news is currently loading. If true, reloadNews() will do nothing.
-    bool isLoadingNews() const;
-
-    /*!
-     * Returns a list of news entries.
-     */
-    QList<NewsEntryPtr> getNewsEntries() const;
-
-    /*!
-     * Reloads the news from the website's RSS feed.
-     * If the news is already loading, this does nothing.
-     */
-    void Q_SLOT reloadNews();
-
-signals:
-    /*!
-     * Signal fired after the news has finished loading.
-     */
-    void newsLoaded();
-
-    /*!
-     * Signal fired after the news fails to load.
-     */
-    void newsLoadingFailed(QString errorMsg);
-
-protected slots:
-    void rssDownloadFinished();
-    void rssDownloadFailed(QString reason);
-
-protected: /* data */
-    //! The URL for the RSS feed to fetch.
-    QString m_feedUrl;
-
-    //! List of news entries.
-    QList<NewsEntryPtr> m_newsEntries;
-
-    //! The network job to use to load the news.
-    NetJob::Ptr m_newsNetJob;
-
-    //! True if news has been loaded.
-    bool m_loadedNews;
-
-    QByteArray newsData;
-
-    /*!
-     * Gets the error message that was given last time the news was loaded.
-     * If the last news load succeeded, this will be an empty string.
-     */
-    QString m_lastLoadError;
-
-    shared_qobject_ptr<QNetworkAccessManager> m_network;
-
-protected slots:
-    /// Emits newsLoaded() and sets m_lastLoadError to empty string.
-    void succeed();
-
-    /// Emits newsLoadingFailed() and sets m_lastLoadError to the given message.
-    void fail(const QString& errorMsg);
-};
-
diff --git a/launcher/news/NewsEntry.cpp b/launcher/news/NewsEntry.cpp
deleted file mode 100644
index 7eff657b..00000000
--- a/launcher/news/NewsEntry.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NewsEntry.h"
-
-#include <QDomNodeList>
-#include <QVariant>
-
-NewsEntry::NewsEntry(QObject* parent) :
-    QObject(parent)
-{
-    this->title = tr("Untitled");
-    this->content = tr("No content.");
-    this->link = "";
-    this->author = tr("Unknown Author");
-    this->pubDate = QDateTime::currentDateTime();
-}
-
-NewsEntry::NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent) :
-    QObject(parent)
-{
-    this->title = title;
-    this->content = content;
-    this->link = link;
-    this->author = author;
-    this->pubDate = pubDate;
-}
-
-/*!
- * Gets the text content of the given child element as a QVariant.
- */
-inline QString childValue(const QDomElement& element, const QString& childName, QString defaultVal="")
-{
-    QDomNodeList nodes = element.elementsByTagName(childName);
-    if (nodes.count() > 0)
-    {
-        QDomElement element = nodes.at(0).toElement();
-        return element.text();
-    }
-    else
-    {
-        return defaultVal;
-    }
-}
-
-bool NewsEntry::fromXmlElement(const QDomElement& element, NewsEntry* entry, QString* errorMsg)
-{
-    QString title = childValue(element, "title", tr("Untitled"));
-    QString content = childValue(element, "description", tr("No content."));
-    QString link = childValue(element, "link");
-    QString author = childValue(element, "dc:creator", tr("Unknown Author"));
-    QString pubDateStr = childValue(element, "pubDate");
-
-    // FIXME: For now, we're just ignoring timezones. We assume that all time zones in the RSS feed are the same.
-    QString dateFormat("ddd, dd MMM yyyy hh:mm:ss");
-    QDateTime pubDate = QDateTime::fromString(pubDateStr, dateFormat);
-
-    entry->title = title;
-    entry->content = content;
-    entry->link = link;
-    entry->author = author;
-    entry->pubDate = pubDate;
-    return true;
-}
-
diff --git a/launcher/news/NewsEntry.h b/launcher/news/NewsEntry.h
deleted file mode 100644
index 0dbc70a5..00000000
--- a/launcher/news/NewsEntry.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2013-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QDomElement>
-#include <QDateTime>
-
-#include <memory>
-
-class NewsEntry : public QObject
-{
-    Q_OBJECT
-
-public:
-    /*!
-     * Constructs an empty news entry.
-     */
-    explicit NewsEntry(QObject* parent=0);
-
-    /*!
-     * Constructs a new news entry.
-     * Note that content may contain HTML.
-     */
-    NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent=0);
-
-    /*!
-     * Attempts to load information from the given XML element into the given news entry pointer.
-     * If this fails, the function will return false and store an error message in the errorMsg pointer.
-     */
-    static bool fromXmlElement(const QDomElement& element, NewsEntry* entry, QString* errorMsg=0);
-
-
-    //! The post title.
-    QString title;
-
-    //! The post's content. May contain HTML.
-    QString content;
-
-    //! URL to the post.
-    QString link;
-
-    //! The post's author.
-    QString author;
-    
-    //! The date and time that this post was published.
-    QDateTime pubDate;
-};
-
-typedef std::shared_ptr<NewsEntry> NewsEntryPtr;
-
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
index 2e744007..0fa82e35 100644
--- a/launcher/translations/TranslationsModel.cpp
+++ b/launcher/translations/TranslationsModel.cpp
@@ -143,6 +143,11 @@ struct TranslationsModel::Private
 
     std::unique_ptr<POTranslator> m_po_translator;
     QFileSystemWatcher *watcher;
+
+    const QString m_system_locale = QLocale::system().name();
+    const QString m_system_language = m_system_locale.split('_').front();
+
+    bool no_language_set = false;
 };
 
 TranslationsModel::TranslationsModel(QString path, QObject* parent): QAbstractListModel(parent)
@@ -164,7 +169,10 @@ TranslationsModel::~TranslationsModel()
 void TranslationsModel::translationDirChanged(const QString& path)
 {
     qDebug() << "Dir changed:" << path;
-    reloadLocalFiles();
+    if (!d->no_language_set)
+    {
+        reloadLocalFiles();
+    }
     selectLanguage(selectedLanguage());
 }
 
@@ -172,7 +180,26 @@ void TranslationsModel::indexReceived()
 {
     qDebug() << "Got translations index!";
     d->m_index_job.reset();
-    if(d->m_selectedLanguage != defaultLangCode)
+
+    if (d->no_language_set)
+    {
+        reloadLocalFiles();
+
+        auto language = d->m_system_locale;
+        if (!findLanguage(language))
+        {
+            language = d->m_system_language;
+        }
+        selectLanguage(language);
+        if (selectedLanguage() != defaultL