From 9f90de2242ec30e519169a00873ff5fac0f163b6 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Wed, 31 Dec 2025 17:55:31 +0100
Subject: [PATCH] change the release channel based on version string (#6447)

* change the release channel based on version string

* Apply suggestions from code review

* format
---
 .../src/client/settings/cache_settings.cpp    | 19 +++++++++++++++++--
 cockatrice/src/interface/window_main.cpp      | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 7a518df67..fde8e9b34 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -2,6 +2,7 @@
 
 #include "../network/update/client/release_channel.h"
 #include "card_counter_settings.h"
+#include "version_string.h"
 
 #include <QAbstractListModel>
 #include <QApplication>
@@ -198,7 +199,13 @@ SettingsCache::SettingsCache()
 
     mbDownloadSpoilers = settings->value("personal/downloadspoilers", false).toBool();
 
-    checkUpdatesOnStartup = settings->value("personal/startupUpdateCheck", true).toBool();
+    if (settings->contains("personal/startupUpdateCheck")) {
+        checkUpdatesOnStartup = settings->value("personal/startupUpdateCheck", true).toBool();
+    } else if (QString(VERSION_STRING).contains("custom", Qt::CaseInsensitive)) {
+        checkUpdatesOnStartup = false; // do not run auto updater on custom version
+    } else {
+        checkUpdatesOnStartup = true; // default to run auto updater
+    }
     startupCardUpdateCheckPromptForUpdate =
         settings->value("personal/startupCardUpdateCheckPromptForUpdate", true).toBool();
     startupCardUpdateCheckAlwaysUpdate = settings->value("personal/startupCardUpdateCheckAlwaysUpdate", false).toBool();
@@ -206,7 +213,15 @@ SettingsCache::SettingsCache()
     lastCardUpdateCheck = settings->value("personal/lastCardUpdateCheck", QDateTime::currentDateTime().date()).toDate();
     notifyAboutUpdates = settings->value("personal/updatenotification", true).toBool();
     notifyAboutNewVersion = settings->value("personal/newversionnotification", true).toBool();
-    updateReleaseChannel = settings->value("personal/updatereleasechannel", 0).toInt();
+
+    if (settings->contains("personal/updatereleasechannel")) {
+        updateReleaseChannel = settings->value("personal/updatereleasechannel").toInt();
+    } else if (QString(VERSION_STRING).contains("beta", Qt::CaseInsensitive)) {
+        // default to beta if this is a beta release
+        updateReleaseChannel = 1;
+    } else {
+        updateReleaseChannel = 0; // stable
+    }
 
     lang = settings->value("personal/lang").toString();
     keepalive = settings->value("personal/keepalive", 3).toInt();
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 41113185c..2e135d170 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -938,9 +938,25 @@ void MainWindow::startupConfigCheck()
             const auto reloadOk0 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
         }
 
-        qCInfo(WindowMainStartupShortcutsLog) << "[MainWindow] Migrating shortcuts after update detected.";
+        qCInfo(WindowMainStartupShortcutsLog) << "Migrating shortcuts after update detected.";
         SettingsCache::instance().shortcuts().migrateShortcuts();
 
+        if (SettingsCache::instance().getCheckUpdatesOnStartup()) {
+            if (QString(VERSION_STRING).contains("custom", Qt::CaseInsensitive)) {
+                qCInfo(WindowMainStartupShortcutsLog) << "Update has changed to custom version, disabling auto update";
+                SettingsCache::instance().setCheckUpdatesOnStartup(Qt::Unchecked);
+            } else {
+                int channel = 0;
+                if (QString(VERSION_STRING).contains("beta", Qt::CaseInsensitive)) {
+                    channel = 1;
+                }
+                if (SettingsCache::instance().getUpdateReleaseChannelIndex() != channel) {
+                    qCInfo(WindowMainStartupShortcutsLog) << "Update has changed beta state, updating release channel.";
+                    SettingsCache::instance().setUpdateReleaseChannelIndex(channel);
+                }
+            }
+        }
+
         SettingsCache::instance().setClientVersion(VERSION_STRING);
     } else {
         // previous config from this version found