Merge branch 'develop' into feature/sparkle-mac

# Conflicts:
#	.github/workflows/build.yml

62 files changed, 1694 insertions, 826 deletions

diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp
index 287eb74f..b889e6f7 100644
--- a/launcher/ui/pages/global/APIPage.cpp
+++ b/launcher/ui/pages/global/APIPage.cpp
@@ -3,6 +3,7 @@
  *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (c) 2022 Lenny McLennington <lenny@sneed.church>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -46,16 +47,43 @@
 #include "settings/SettingsObject.h"
 #include "tools/BaseProfiler.h"
 #include "Application.h"
+#include "net/PasteUpload.h"
+#include "BuildConfig.h"
 
 APIPage::APIPage(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::APIPage)
 {
+    // This is here so you can reorder the entries in the combobox without messing stuff up
+    int comboBoxEntries[] = {
+        PasteUpload::PasteType::Mclogs,
+        PasteUpload::PasteType::NullPointer,
+        PasteUpload::PasteType::PasteGG,
+        PasteUpload::PasteType::Hastebin
+    };
+
     static QRegularExpression validUrlRegExp("https?://.+");
+
     ui->setupUi(this);
-    ui->urlChoices->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->urlChoices));
-    ui->tabWidget->tabBar()->hide();\
+
+    for (auto pasteType : comboBoxEntries) {
+        ui->pasteTypeComboBox->addItem(PasteUpload::PasteTypes.at(pasteType).name, pasteType);
+    }
+
+    void (QComboBox::*currentIndexChangedSignal)(int) (&QComboBox::currentIndexChanged);
+    connect(ui->pasteTypeComboBox, currentIndexChangedSignal, this, &APIPage::updateBaseURLPlaceholder);
+    // This function needs to be called even when the ComboBox's index is still in its default state.
+    updateBaseURLPlaceholder(ui->pasteTypeComboBox->currentIndex());
+    ui->baseURLEntry->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->baseURLEntry));
+
+    ui->metaURL->setPlaceholderText(BuildConfig.META_URL);
+    ui->userAgentLineEdit->setPlaceholderText(BuildConfig.USER_AGENT);
+
     loadSettings();
+
+    resetBaseURLNote();
+    connect(ui->pasteTypeComboBox, currentIndexChangedSignal, this, &APIPage::updateBaseURLNote);
+    connect(ui->baseURLEntry, &QLineEdit::textEdited, this, &APIPage::resetBaseURLNote);
 }
 
 APIPage::~APIPage()
@@ -63,22 +91,85 @@ APIPage::~APIPage()
     delete ui;
 }
 
+void APIPage::resetBaseURLNote()
+{
+    ui->baseURLNote->hide();
+    baseURLPasteType = ui->pasteTypeComboBox->currentIndex();
+}
+
+void APIPage::updateBaseURLNote(int index)
+{
+    if (baseURLPasteType == index)
+    {
+        ui->baseURLNote->hide();
+    }
+    else if (!ui->baseURLEntry->text().isEmpty())
+    {
+        ui->baseURLNote->show();
+    }
+}
+
+void APIPage::updateBaseURLPlaceholder(int index)
+{
+    int pasteType = ui->pasteTypeComboBox->itemData(index).toInt();
+    QString pasteDefaultURL = PasteUpload::PasteTypes.at(pasteType).defaultBase;
+    ui->baseURLEntry->setPlaceholderText(pasteDefaultURL);
+}
+
 void APIPage::loadSettings()
 {
     auto s = APPLICATION->settings();
-    QString pastebinURL = s->get("PastebinURL").toString();
-    ui->urlChoices->setCurrentText(pastebinURL);
+
+    int pasteType = s->get("PastebinType").toInt();
+    QString pastebinURL = s->get("PastebinCustomAPIBase").toString();
+
+    ui->baseURLEntry->setText(pastebinURL);
+    int pasteTypeIndex = ui->pasteTypeComboBox->findData(pasteType);
+    if (pasteTypeIndex == -1)
+    {
+        pasteTypeIndex = ui->pasteTypeComboBox->findData(PasteUpload::PasteType::Mclogs);
+        ui->baseURLEntry->clear();
+    }
+
+    ui->pasteTypeComboBox->setCurrentIndex(pasteTypeIndex);
+
     QString msaClientID = s->get("MSAClientIDOverride").toString();
     ui->msaClientID->setText(msaClientID);
+    QString metaURL = s->get("MetaURLOverride").toString();
+    ui->metaURL->setText(metaURL);
+    QString curseKey = s->get("CFKeyOverride").toString();
+    ui->curseKey->setText(curseKey);
+    QString customUserAgent = s->get("UserAgentOverride").toString();
+    ui->userAgentLineEdit->setText(customUserAgent);
 }
 
 void APIPage::applySettings()
 {
     auto s = APPLICATION->settings();
-    QString pastebinURL = ui->urlChoices->currentText();
-    s->set("PastebinURL", pastebinURL);
+
+    s->set("PastebinType", ui->pasteTypeComboBox->currentData().toInt());
+    s->set("PastebinCustomAPIBase", ui->baseURLEntry->text());
+
     QString msaClientID = ui->msaClientID->text();
     s->set("MSAClientIDOverride", msaClientID);
+    QUrl metaURL = ui->metaURL->text();
+    // Add required trailing slash
+    if (!metaURL.isEmpty() && !metaURL.path().endsWith('/'))
+    {
+        QString path = metaURL.path();
+        path.append('/');
+        metaURL.setPath(path);
+    }
+    // Don't allow HTTP, since meta is basically RCE with all the jar files.
+    if(!metaURL.isEmpty() && metaURL.scheme() == "http")
+    {
+        metaURL.setScheme("https");
+    }
+
+    s->set("MetaURLOverride", metaURL);
+    QString curseKey = ui->curseKey->text();
+    s->set("CFKeyOverride", curseKey);
+    s->set("UserAgentOverride", ui->userAgentLineEdit->text());
 }
 
 bool APIPage::apply()
diff --git a/launcher/ui/pages/global/APIPage.h b/launcher/ui/pages/global/APIPage.h
index 20356009..17e62ae7 100644
--- a/launcher/ui/pages/global/APIPage.h
+++ b/launcher/ui/pages/global/APIPage.h
@@ -3,6 +3,7 @@
  *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (c) 2022 Lenny McLennington <lenny@sneed.church>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -73,6 +74,10 @@ public:
     void retranslate() override;
 
 private:
+    int baseURLPasteType;
+    void resetBaseURLNote();
+    void updateBaseURLNote(int index);
+    void updateBaseURLPlaceholder(int index);
     void loadSettings();
     void applySettings();
 
diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index acde9aef..5327771c 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>491</width>
-    <height>474</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -30,56 +30,91 @@
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
-       <string notr="true">Tab 1</string>
+       <string notr="true">Services</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QGroupBox" name="groupBox_paste">
          <property name="title">
-          <string>&amp;Pastebin URL</string>
+          <string>&amp;Pastebin Service</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+           <widget class="QLabel" name="pasteServiceTypeLabel">
+            <property name="text">
+             <string>Paste Service &amp;Type</string>
+            </property>
+            <property name="buddy">
+             <cstring>pasteTypeComboBox</cstring>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label_2">
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-             </font>
+           <widget class="QComboBox" name="pasteTypeComboBox"/>
+          </item>
+          <item>
+           <widget class="QLabel" name="baseURLLabel">
+            <property name="text">
+             <string>Base &amp;URL</string>
+            </property>
+            <property name="buddy">
+             <cstring>baseURLEntry</cstring>
             </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="baseURLEntry">
+            <property name="placeholderText">
+             <string/>
+            </property>
+            <property name="clearButtonEnabled">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="baseURLNote">
             <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: only input that starts with &lt;span style=&quot; font-weight:600;&quot;&gt;http://&lt;/span&gt; or &lt;span style=&quot; font-weight:600;&quot;&gt;https://&lt;/span&gt; will be accepted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>Note: you probably want to change or clear the Base URL after changing the paste service type.</string>
             </property>
-            <property name="scaledContents">
-             <bool>false</bool>
+            <property name="wordWrap">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_meta">
+         <property name="title">
+          <string>Meta&amp;data Server</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
-           <widget class="QComboBox" name="urlChoices">
-            <property name="editable">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>You can set this to a third-party metadata server to use patched libraries or other hacks.</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::RichText</enum>
+            </property>
+            <property name="wordWrap">
              <bool>true</bool>
             </property>
-            <property name="insertPolicy">
-             <enum>QComboBox::NoInsert</enum>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="metaURL">
+            <property name="placeholderText">
+             <string/>
             </property>
-            <item>
-             <property name="text">
-              <string notr="true">https://0x0.st</string>
-             </property>
-            </item>
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label">
+           <widget class="QLabel" name="label_6">
             <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Here you can choose from a predefined list of paste services, or input the URL of a different paste service of your choice, provided it supports the same protocol as 0x0.st, that is POST a file parameter to the URL and return a link in the response body.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>Enter a custom URL for meta here.</string>
             </property>
             <property name="textFormat">
              <enum>Qt::RichText</enum>
@@ -96,19 +131,32 @@
         </widget>
        </item>
        <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>API Keys</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_8">
+       <item>
         <widget class="QGroupBox" name="groupBox_msa">
          <property name="title">
           <string>&amp;Microsoft Authentication</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
-           <widget class="Line" name="line_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
            <widget class="QLabel" name="label_3">
             <property name="text">
              <string>Note: you probably don't need to set this if logging in via Microsoft Authentication already works.</string>
@@ -148,6 +196,51 @@
         </widget>
        </item>
        <item>
+        <widget class="QGroupBox" name="groupBox_curse">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>&amp;CurseForge Core API</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>Note: you probably don't need to set this if CurseForge already works.</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>Enter a custom API Key for CurseForge here. </string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::RichText</enum>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLineEdit" name="curseKey">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="placeholderText">
+             <string>(Default)</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -162,13 +255,55 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>Miscellaneous</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <widget class="QGroupBox" name="groupBox_ua">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="title">
+          <string>User Agent</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_7">
+          <item>
+           <widget class="QLineEdit" name="userAgentLineEdit"/>
+          </item>
+          <item>
+           <widget class="QLabel" name="userAgentLabel">
+            <property name="text">
+             <string>Enter a custom User Agent here. The special string $LAUNCHER_VER will be replaced with the version of the launcher.</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>t