Refactor URLs.

Author: Mysticial

SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp

@@ -140,7 +140,7 @@ GlobalSettings::GlobalSettings()
     , m_discord_settings(
         "<font size=4><b>Discord Settings:</b> Integrate with Discord. (" +
         make_text_url(
-            ONLINE_DOC_URL + "ComputerControl/blob/master/Wiki/Software/DiscordIntegration.md",
+            ONLINE_DOC_URL_BASE + "ComputerControl/blob/master/Wiki/Software/DiscordIntegration.md",
             "online documentation"
         ) + ")</font>"
     )
@@ -248,7 +248,7 @@ void GlobalSettings::load_json(const JsonValue& json){
     m_discord_settings.set_text(
         "<font size=4><b>Discord Settings:</b> Integrate with Discord. (" +
         make_text_url(
-            ONLINE_DOC_URL + "ComputerControl/blob/master/Wiki/Software/DiscordIntegration.md",
+            ONLINE_DOC_URL_BASE + "ComputerControl/blob/master/Wiki/Software/DiscordIntegration.md",
             "online documentation"
         ) + ")</font>"
     );

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -43,15 +43,34 @@ const std::string PROGRAM_VERSION = PROGRAM_VERSION_BASE + "-user";
 
 
 
-
 const std::string PROGRAM_NAME = "Pok\u00e9mon Automation";
 
-const std::string DISCORD_LINK = "discord.gg/PokemonAutomation";
-const std::string DISCORD_LINK_URL = "https://discord.gg/BSjDp27";
-const std::string ONLINE_DOC_URL = "https://github.com/PokemonAutomation/";
-const std::string PROJECT_GITHUB = "github.com/PokemonAutomation";
-const std::string PROJECT_GITHUB_URL = "https://github.com/PokemonAutomation/";
+const std::string ONLINE_DOC_URL_BASE = "https://github.com/PokemonAutomation/";
 const std::string PROJECT_SOURCE_URL = "https://github.com/PokemonAutomation/Arduino-Source/";
+const std::string RESOURCES_URL_BASE = "https://github.com/PokemonAutomation/Packages/";
+
+
+
+//  This the URL that we display. We don't actually use this for linking.
+const std::string GITHUB_LINK_TEXT = "github.com/PokemonAutomation";
+
+//  This is the URL that we actually link to.
+const std::string GITHUB_LINK_URL = "https://github.com/PokemonAutomation/About/blob/master/README.md";
+
+
+
+//  URL to display. (the vanity link)
+//  We don't actually use this URL for linking since the vanity link will go
+//  away if we lose too many nitro boosts.
+const std::string DISCORD_LINK_TEXT = "discord.gg/PokemonAutomation";
+
+//  URL to use inside the program.
+const std::string DISCORD_LINK_URL_PROGRAM = "https://discord.gg/BSjDp27";
+
+//  URL to use in the Discord notifications/embeds.
+const std::string DISCORD_LINK_URL_EMBED = "https://discord.gg/xMJcveK";
+
+
 
 #if 0
 #elif __INTEL_LLVM_COMPILER

SerialPrograms/Source/CommonFramework/Globals.h

@@ -7,7 +7,6 @@
 #ifndef PokemonAutomation_Globals_H
 #define PokemonAutomation_Globals_H
 
-#include <chrono>
 #include <string>
 
 namespace PokemonAutomation{
@@ -22,16 +21,18 @@ extern const std::string PROGRAM_VERSION;
 
 extern const std::string PROGRAM_NAME;
 
-extern const std::string DISCORD_LINK;
-extern const std::string DISCORD_LINK_URL;
-extern const std::string ONLINE_DOC_URL;
-extern const std::string PROJECT_GITHUB;
-extern const std::string PROJECT_GITHUB_URL;
+extern const std::string ONLINE_DOC_URL_BASE;
 extern const std::string PROJECT_SOURCE_URL;
+extern const std::string RESOURCES_URL_BASE;
 
-extern const std::string COMPILER_VERSION;
+extern const std::string GITHUB_LINK_TEXT;
+extern const std::string GITHUB_LINK_URL;
+
+extern const std::string DISCORD_LINK_TEXT;
+extern const std::string DISCORD_LINK_URL_PROGRAM;
+extern const std::string DISCORD_LINK_URL_EMBED;
 
-const auto SERIAL_REFRESH_RATE = std::chrono::milliseconds(1000);
+extern const std::string COMPILER_VERSION;
 
 extern const size_t LOG_HISTORY_LINES;
 

SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp

@@ -43,9 +43,9 @@ JsonObject make_credits_field(const ProgramInfo& info){
         ? PROGRAM_NAME + " CC " + PROGRAM_VERSION + "-dev"
         : PROGRAM_NAME + " CC " + PROGRAM_VERSION + "";
     if (GlobalSettings::instance().HIDE_NOTIF_DISCORD_LINK){
-        text += " ([GitHub](" + PROJECT_GITHUB_URL + "About/))";
+        text += " ([GitHub](" + GITHUB_LINK_URL + "))";
     }else{
-        text += " ([GitHub](" + PROJECT_GITHUB_URL + "About/)/[Discord](" + DISCORD_LINK_URL + "))";
+        text += " ([GitHub](" + GITHUB_LINK_URL + ")/[Discord](" + DISCORD_LINK_URL_EMBED + "))";
     }
     field["value"] = std::move(text);
     return field;

SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp

@@ -31,7 +31,7 @@ CollapsibleGroupBox* make_panel_header(
 
     std::string name_text = "<b>Name:</b> " + display_name;
     if (!doc_link.empty()){
-        std::string path = ONLINE_DOC_URL + doc_link;
+        std::string path = ONLINE_DOC_URL_BASE + doc_link;
         name_text += " (" + make_text_url(path, "online documentation") + ")";
     }
     QLabel* name_label = new QLabel(QString::fromStdString(name_text), header);

SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp

@@ -96,7 +96,7 @@ MainWindow::MainWindow(QWidget* parent)
         layout->addWidget(m_sleep_text, 2);
         m_sleep_box = new QCheckBox("Force On", support_box);
         layout->addWidget(m_sleep_box, 1, Qt::AlignHCenter);
-        sleep_suppress_state_changed(SystemSleepController::instance().current_state());
+        MainWindow::sleep_suppress_state_changed(SystemSleepController::instance().current_state());
 #if QT_VERSION < 0x060700
         connect(
             m_sleep_box, &QCheckBox::stateChanged,
@@ -131,23 +131,23 @@ MainWindow::MainWindow(QWidget* parent)
     {
         QLabel* github = new QLabel(support_box);
         links->addWidget(github);
-        github->setText(QString::fromStdString(make_text_url(ONLINE_DOC_URL + "ComputerControl/", "Online Documentation")));
+        github->setText(QString::fromStdString(make_text_url(ONLINE_DOC_URL_BASE + "ComputerControl/", "Online Documentation")));
         github->setTextFormat(Qt::RichText);
         github->setTextInteractionFlags(Qt::TextBrowserInteraction);
         github->setOpenExternalLinks(true);
     }
     {
         QLabel* discord = new QLabel(support_box);
         links->addWidget(discord);
-        discord->setText(QString::fromStdString(make_text_url(DISCORD_LINK_URL, DISCORD_LINK)));
+        discord->setText(QString::fromStdString(make_text_url(DISCORD_LINK_URL_PROGRAM, DISCORD_LINK_TEXT)));
         discord->setTextFormat(Qt::RichText);
         discord->setTextInteractionFlags(Qt::TextBrowserInteraction);
         discord->setOpenExternalLinks(true);
     }
     {
         QLabel* github = new QLabel(support_box);
         links->addWidget(github);
-        github->setText(QString::fromStdString(make_text_url(PROJECT_GITHUB_URL, PROJECT_GITHUB)));
+        github->setText(QString::fromStdString(make_text_url(GITHUB_LINK_URL, GITHUB_LINK_TEXT)));
 //        github->setText("<a href=\"" + GITHUB_REPO + "\">GitHub Repository</a>");
         github->setTextFormat(Qt::RichText);
         github->setTextInteractionFlags(Qt::TextBrowserInteraction);
@@ -156,7 +156,7 @@ MainWindow::MainWindow(QWidget* parent)
     {
         QLabel* about = new QLabel(support_box);
         links->addWidget(about);
-        about->setText(QString::fromStdString(make_text_url(PROJECT_GITHUB_URL, "About this Program")));
+        about->setText(QString::fromStdString(make_text_url(GITHUB_LINK_URL, "About this Program")));
         about->setTextFormat(Qt::RichText);
         connect(
             about, &QLabel::linkActivated,

SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp

@@ -98,7 +98,7 @@ void LanguageOCRCellWidget::update_value(){
         m_status->setText(
             QString::fromStdString(
                 "<font color=\"red\">No text recognition data found for " + language.name + ".</font>\n" +
-                "<a href=\"" + PROJECT_GITHUB_URL + "Packages/blob/master/SerialPrograms/Resources/Tesseract/\">Download from here.</a>"
+                "<a href=\"" + RESOURCES_URL_BASE + "blob/master/SerialPrograms/Resources/Tesseract/\">Download from here.</a>"
             )
         );
         m_status->setVisible(true);

SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp

@@ -194,7 +194,10 @@ void Handler::create_unified_commands(commandhandler& handler){
             embed.add_field("Guilds", std::to_string(Utility::user_counts.size()));
             embed.add_field("Users", std::to_string(counts));
             embed.add_field("Uptime", handler.owner->uptime().to_string());
-            embed.add_field("Powered By", PROGRAM_NAME + " " + PROGRAM_VERSION + " ([GitHub](" + PROJECT_GITHUB_URL + "/About)/[Discord](" + DISCORD_LINK_URL + "))");
+            embed.add_field(
+                "Powered By",
+                PROGRAM_NAME + " " + PROGRAM_VERSION + " ([GitHub](" + GITHUB_LINK_URL + ")/[Discord](" + DISCORD_LINK_URL_EMBED + "))"
+            );
 
             message message;
             message.add_embed(embed);

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

@@ -145,6 +145,7 @@
 
 
 //#include <opencv2/core.hpp>
+#include <onnxruntime_cxx_api.h>
 #include <random>
 
 

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp

@@ -100,7 +100,7 @@ EggAutonomous::EggAutonomous()
     , AUTO_SAVING(
         "<b>Auto-Saving:</b><br>Automatically save the game to recover from crashes and allow eggs to be unhatched.<br>" +
         make_text_url(
-            ONLINE_DOC_URL + "ComputerControl/blob/master/Wiki/Programs/PokemonSV/EggAutonomous.md#auto-saving-mode",
+            ONLINE_DOC_URL_BASE + "ComputerControl/blob/master/Wiki/Programs/PokemonSV/EggAutonomous.md#auto-saving-mode",
             "See the wiki for the full explanations of each mode."
         ),
         {