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

Merge 8432dae653 into dd2018a2d3

Browse source
This commit is contained in:
BruebachL 2026-11-09 12:54:15 +01:00 • committed by GitHub
commit 6a8835f136
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 1021 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servatrice/src/serversocketinterface.cpp
View file

@ -1115,7 +1115,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
const QString bannerCardProvider = deck.getBannerCard().providerId.left(32);
const QString tagsJson = serializeDeckTags(deck.getTags());
const QString colorIdentity = sanitizeColorIdentity(nameFromStdString(cmd.color_identity()));
const QString deckHash = deck.getDeckHash();
// Hash the timestamp-free serialisation, the same way DeckSyncManager hashes
// local files, so uploads from any path or client version compare equal.
const QString deckHash = deck.getContentHash();
QString guid = cmd.has_guid() ? nameFromStdString(cmd.guid()).left(36) : QString();
if (QUuid::fromString(guid).isNull()) {
guid = QUuid::createUuid().toString(QUuid::WithoutBraces);