jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 21:40:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Isolate Continuumatrice URLs, updates, and card artwork sources

Browse source
This commit is contained in:
Christian Daniel Jensen 2026-11-02 03:03:09 -07:00
parent 7e8aa42d63
commit bd6477a28a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/main.cpp
View file

@ -137,9 +137,9 @@ QString const generateClientID()
static QString redactActivationUrl(const QString &url) static QString redactActivationUrl(const QString &url)
{ {
// Activation URLs carry secrets in their query string (e.g. the deck share // Activation URLs carry secrets in their query string (e.g. the deck share
// token); log only the scheme and the action (cockatrice://opendeck), never // token); log only the scheme and the action (continuumatrice://opendeck), never
// the parameters. // the parameters.
if (!url.startsWith(QStringLiteral("cockatrice://"))) { if (!url.startsWith(QStringLiteral("continuumatrice://"))) {
return url; return url;
} }
const QUrl parsed(url); const QUrl parsed(url);
@ -219,7 +219,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
UrlSchemeEventFilter cockatriceFilter(QStringList{QStringLiteral("cockatrice")}); UrlSchemeEventFilter cockatriceFilter(QStringList{QStringLiteral("continuumatrice")});
QStringList pendingMacUrls; QStringList pendingMacUrls;
@ -448,7 +448,7 @@ int main(int argc, char *argv[])
// auto-connect must not race against it (two connectToServer calls tear // auto-connect must not race against it (two connectToServer calls tear
// each other down via doDisconnectFromServer). // each other down via doDisconnectFromServer).
bool hasUrlActivation = std::any_of(startupFiles.begin(), startupFiles.end(), [](const QString &file) { bool hasUrlActivation = std::any_of(startupFiles.begin(), startupFiles.end(), [](const QString &file) {
return file.startsWith(QStringLiteral("cockatrice://")); return file.startsWith(QStringLiteral("continuumatrice://"));
}); });
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// On macOS the launch can arrive through the URL scheme instead of as a // On macOS the launch can arrive through the URL scheme instead of as a
@ -456,12 +456,12 @@ int main(int argc, char *argv[])
// window would auto-connect into the link's own connection attempt. // window would auto-connect into the link's own connection attempt.
hasUrlActivation = hasUrlActivation || hasUrlActivation = hasUrlActivation ||
std::any_of(pendingMacUrls.cbegin(), pendingMacUrls.cend(), std::any_of(pendingMacUrls.cbegin(), pendingMacUrls.cend(),
[](const QString &url) { return url.startsWith(QStringLiteral("cockatrice://")); }); [](const QString &url) { return url.startsWith(QStringLiteral("continuumatrice://")); });
#endif #endif
ui.setSkipStartupAutoConnect(hasUrlActivation); ui.setSkipStartupAutoConnect(hasUrlActivation);
auto handleActivation = [&ui](const QString &file) { auto handleActivation = [&ui](const QString &file) {
if (file.startsWith("cockatrice://")) { if (file.startsWith("continuumatrice://")) {
qCInfo(MainLog) << "Handling URL activation:" << redactActivationUrl(file); qCInfo(MainLog) << "Handling URL activation:" << redactActivationUrl(file);
// Route through the window's persistent url parser: it serializes // Route through the window's persistent url parser: it serializes
// link chains so activations handed over while another chain is // link chains so activations handed over while another chain is