From b3f8d0e81aab9b48275dea9315db3e1ea630a12c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 24 Aug 2021 18:36:26 +0300
Subject: [PATCH] Removed dcId from passport FileKey.

---
 Telegram/SourceFiles/passport/passport_form_controller.cpp  | 6 +++---
 Telegram/SourceFiles/passport/passport_form_controller.h    | 5 ++---
 Telegram/SourceFiles/passport/passport_panel_controller.cpp | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index 205662a13..11ee2a071 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -1745,7 +1745,7 @@ void FormController::loadFile(File &file) {
 		return;
 	}
 
-	const auto key = FileKey{ file.id, file.dcId };
+	const auto key = FileKey{ file.id };
 	const auto i = _fileLoaders.find(key);
 	if (i != _fileLoaders.end()) {
 		return;
@@ -2466,14 +2466,14 @@ EditFile *FormController::findEditFile(const FullMsgId &fullId) {
 
 EditFile *FormController::findEditFile(const FileKey &key) {
 	return findEditFileByCondition([&](const EditFile &file) {
-		return (file.fields.dcId == key.dcId && file.fields.id == key.id);
+		return (file.fields.id == key.id);
 	});
 }
 
 auto FormController::findFile(const FileKey &key)
 -> std::pair<Value*, File*> {
 	const auto found = [&](const File &file) {
-		return (file.dcId == key.dcId) && (file.id == key.id);
+		return (file.id == key.id);
 	};
 	for (auto &pair : _form.values) {
 		auto &value = pair.second;
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.h b/Telegram/SourceFiles/passport/passport_form_controller.h
index da6741187..1aa26be03 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.h
+++ b/Telegram/SourceFiles/passport/passport_form_controller.h
@@ -336,16 +336,15 @@ struct PasswordSettings {
 
 struct FileKey {
 	uint64 id = 0;
-	int32 dcId = 0;
 
 	inline bool operator==(const FileKey &other) const {
-		return (id == other.id) && (dcId == other.dcId);
+		return (id == other.id);
 	}
 	inline bool operator!=(const FileKey &other) const {
 		return !(*this == other);
 	}
 	inline bool operator<(const FileKey &other) const {
-		return (id < other.id) || ((id == other.id) && (dcId < other.dcId));
+		return (id < other.id);
 	}
 	inline bool operator>(const FileKey &other) const {
 		return (other < *this);
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.cpp b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
index f65f7878b..9527a04eb 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
@@ -75,7 +75,7 @@ ScanInfo CollectScanInfo(const EditFile &file) {
 	}();
 	return {
 		file.type,
-		FileKey{ file.fields.id, file.fields.dcId },
+		FileKey{ file.fields.id },
 		!file.fields.error.isEmpty() ? file.fields.error : status,
 		file.fields.image,
 		file.deleted,