From 8432dae653a3cec04a5b99b06d32e87ce712eb57 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Sun, 8 Nov 2026 19:11:30 +0100 Subject: [PATCH] Apply suggestion from @ZeldaZach Co-authored-by: Zach H --- servatrice/src/serversocketinterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index a9fedbb82..4eaf9d769 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -1115,9 +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())); - // Hash the exact bytes the client sent: both peers must compare the same - // string, not each side's re-serialisation of it. - const QString deckHash = DeckList::contentHash(deckStr); + // 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);