Merge remote-tracking branch 'upstream/master' into chatterino7

Author: Nerixyz

.github/pull_request_template.md

@@ -3,3 +3,13 @@
     In the case of a bug fix, please include steps to reproduce the bug so the pull request can be tested.
     If this PR fixes an issue on GitHub, mention this here to automatically close it: "Fixes #1234.".
 -->
+
+<!--
+Leave this at the bottom
+
+Co-authored-by: -
+Tested-by: -
+Reported-by: -
+Reviewed-by: -
+Parent-pr: -
+-->

CHANGELOG.md

@@ -27,6 +27,7 @@
 - Minor: Added the ability to filter on messages by the author's external badges (example: `author.external_badges contains "chatterino:Top Donator"` or `author.external_badges contains "frankerfacez:bot"`). (#6709)
 - Minor: Added Markdown support to user notes. (#6490)
 - Minor: Moderators and VIPs in shared chats now show their channel badges. (#6653)
+- Minor: Removed guard from update checker when using a nightly release. (#6752)
 - Minor: Added message read/update methods to the `Channel` plugin API. (#6650)
 - Minor: Added a display name change event to `Channel` for plugins. (#6594)
 - Minor: Added action to reset `/watching`. (#6759)

src/singletons/Updates.cpp

@@ -153,6 +153,13 @@ void Updates::installUpdates()
         return;
     }
 
+    if (Version::instance().isNightly())
+    {
+        // Since Nightly builds can be installed in many different ways, we ask the user to download the update manually.
+        QDesktopServices::openUrl(QUrl("https://chatterino.com/#downloads"));
+        return;
+    }
+
 #ifdef Q_OS_MACOS
     QMessageBox *box = new QMessageBox(
         QMessageBox::Information, "Chatterino Update",
@@ -354,12 +361,6 @@ void Updates::checkForUpdates()
         return;
     }
 
-    // Disable updates if on nightly
-    if (version.isNightly())
-    {
-        return;
-    }
-
     // See https://github.com/SevenTV/SevenTV/issues/48#issue-2193272289
     // for the proposed structure of the response.
     auto onSuccess = [this](const NetworkResult &result) {
@@ -531,6 +532,32 @@ bool Updates::isDowngrade() const
     return this->isDowngrade_;
 }
 
+QString Updates::buildUpdateAvailableText() const
+{
+    const auto &version = Version::instance();
+
+    if (version.isNightly())
+    {
+        // Since Nightly builds can be installed in many different ways, we ask the user to download the update manually.
+        return QString("An update (%1) is available.\n\nDo you want to head to "
+                       "Chatterino.com to download the new update?")
+            .arg(this->getOnlineVersion());
+    }
+
+    if (this->isDowngrade())
+    {
+        return QString("The version online (%1) seems to be lower than the "
+                       "current (%2).\nEither a version was reverted or "
+                       "you are running a newer build.\n\nDo you want to "
+                       "download and install it?")
+            .arg(this->getOnlineVersion(), this->getCurrentVersion());
+    }
+
+    return QString("An update (%1) is available.\n\nDo you want to "
+                   "download and install it?")
+        .arg(this->getOnlineVersion());
+}
+
 void Updates::setStatus_(Status status)
 {
     if (this->status_ != status)

src/singletons/Updates.hpp

@@ -59,6 +59,9 @@ class Updates
     bool isError() const;
     bool isDowngrade() const;
 
+    /// Generates the string that the update dialog will show.
+    QString buildUpdateAvailableText() const;
+
     pajlada::Signals::Signal<Status> statusUpdated;
 
 private:

src/widgets/buttons/InitUpdateButton.cpp

@@ -37,21 +37,10 @@ void initUpdateButton(PixmapButton &button,
         // be destroyed before the button is destroyed, since it is destroyed on focus loss
         //
         // The button is either attached to a Notebook, or a Window frame
-        std::ignore =
-            dialog->buttonClicked.connect([&button, relayout](auto buttonType) {
-                switch (buttonType)
-                {
-                    case UpdateDialog::Dismiss: {
-                        button.hide();
-                        relayout();
-                    }
-                    break;
-                    case UpdateDialog::Install: {
-                        getApp()->getUpdates().installUpdates();
-                    }
-                    break;
-                }
-            });
+        std::ignore = dialog->dismissed.connect([&button, relayout]() {
+            button.hide();
+            relayout();
+        });
 
         //        handle.reset(dialog);
         //        dialog->closing.connect([&handle] { handle.release(); });

src/widgets/dialogs/UpdateDialog.cpp

@@ -5,6 +5,7 @@
 #include "widgets/dialogs/UpdateDialog.hpp"
 
 #include "Application.hpp"
+#include "common/Version.hpp"
 #include "singletons/Updates.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Label.hpp"
@@ -29,7 +30,17 @@ UpdateDialog::UpdateDialog()
         ->setWordWrap(true);
 
     auto buttons = layout.emplace<QDialogButtonBox>();
-    auto *install = buttons->addButton("Install", QDialogButtonBox::AcceptRole);
+
+    const auto *installText = [] {
+        if (Version::instance().isNightly())
+        {
+            return "Yes";
+        }
+
+        return "Install";
+    }();
+    auto *install =
+        buttons->addButton(installText, QDialogButtonBox::AcceptRole);
     this->ui_.installButton = install;
     auto *dismiss = buttons->addButton("Dismiss", QDialogButtonBox::RejectRole);
 
@@ -38,7 +49,7 @@ UpdateDialog::UpdateDialog()
         this->close();
     });
     QObject::connect(dismiss, &QPushButton::clicked, this, [this] {
-        this->buttonClicked.invoke(Dismiss);
+        this->dismissed.invoke();
         this->close();
     });
 
@@ -60,17 +71,7 @@ void UpdateDialog::updateStatusChanged(Updates::Status status)
     {
         case Updates::UpdateAvailable: {
             this->ui_.label->setText(
-                (getApp()->getUpdates().isDowngrade()
-                     ? QString(
-                           "The version online (%1) seems to be lower than the "
-                           "current (%2).\nEither a version was reverted or "
-                           "you are running a newer build.\n\nDo you want to "
-                           "download and install it?")
-                           .arg(getApp()->getUpdates().getOnlineVersion(),
-                                getApp()->getUpdates().getCurrentVersion())
-                     : QString("An update (%1) is available.\n\nDo you want to "
-                               "download and install it?")
-                           .arg(getApp()->getUpdates().getOnlineVersion())));
+                getApp()->getUpdates().buildUpdateAvailableText());
             this->updateGeometry();
         }
         break;

src/widgets/dialogs/UpdateDialog.hpp

@@ -15,14 +15,16 @@ namespace chatterino {
 
 class Label;
 
+/// The UpdateDialog is what's shown to the user after they clicked the update indicator in the tab bar/title bar.
+///
+/// For Nightly builds, we change the "Install" text to "Yes" to better match the question posed by the available update.
 class UpdateDialog : public BaseWindow
 {
 public:
-    enum Button { Dismiss, Install };
-
     UpdateDialog();
 
-    pajlada::Signals::Signal<Button> buttonClicked;
+    /// The user chose to dismiss this update.
+    pajlada::Signals::NoArgSignal dismissed;
 
 private:
     void updateStatusChanged(Updates::Status status);