From b322f986a8b95f3ea14282eaf77293ec9a5c1758 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 7 Oct 2018 12:02:44 +0300
Subject: [PATCH] Provide user phone on auth session create.

We need the phone in the constructor to switch on the support mode.
---
 Telegram/SourceFiles/messenger.cpp                | 11 +++++++++--
 Telegram/SourceFiles/storage/serialize_common.cpp | 15 +++++++++++++++
 Telegram/SourceFiles/storage/serialize_common.h   |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp
index 0ada323eb..fd142279e 100644
--- a/Telegram/SourceFiles/messenger.cpp
+++ b/Telegram/SourceFiles/messenger.cpp
@@ -463,14 +463,21 @@ void Messenger::startMtp() {
 	}
 
 	if (_private->authSessionUserId) {
+		QDataStream peekStream(_private->authSessionUserSerialized);
+		const auto phone = Serialize::peekUserPhone(
+			_private->authSessionUserStreamVersion,
+			peekStream);
+		const auto flags = MTPDuser::Flag::f_self | (phone.isEmpty()
+			? MTPDuser::Flag()
+			: MTPDuser::Flag::f_phone);
 		authSessionCreate(MTP_user(
-			MTP_flags(MTPDuser::Flag::f_self),
+			MTP_flags(flags),
 			MTP_int(base::take(_private->authSessionUserId)),
 			MTPlong(), // access_hash
 			MTPstring(), // first_name
 			MTPstring(), // last_name
 			MTPstring(), // username
-			MTPstring(), // phone
+			MTP_string(phone),
 			MTPUserProfilePhoto(),
 			MTPUserStatus(),
 			MTPint(), // bot_info_version
diff --git a/Telegram/SourceFiles/storage/serialize_common.cpp b/Telegram/SourceFiles/storage/serialize_common.cpp
index 3691f9880..336ece341 100644
--- a/Telegram/SourceFiles/storage/serialize_common.cpp
+++ b/Telegram/SourceFiles/storage/serialize_common.cpp
@@ -260,4 +260,19 @@ PeerData *readPeer(int streamAppVersion, QDataStream &stream) {
 	return result;
 }
 
+QString peekUserPhone(int streamAppVersion, QDataStream &stream) {
+	quint64 peerId = 0, photoId = 0;
+	stream >> peerId >> photoId;
+	if (!peerId || !peerIsUser(peerId)) {
+		return QString();
+	}
+
+	const auto photoLoc = readStorageImageLocation(
+		streamAppVersion,
+		stream);
+	QString first, last, phone;
+	stream >> first >> last >> phone;
+	return phone;
+}
+
 } // namespace Serialize
diff --git a/Telegram/SourceFiles/storage/serialize_common.h b/Telegram/SourceFiles/storage/serialize_common.h
index 51a6910aa..c3d862db0 100644
--- a/Telegram/SourceFiles/storage/serialize_common.h
+++ b/Telegram/SourceFiles/storage/serialize_common.h
@@ -110,5 +110,6 @@ inline MTP::AuthKey::Data read<MTP::AuthKey::Data>(QDataStream &stream) {
 uint32 peerSize(not_null<PeerData*> peer);
 void writePeer(QDataStream &stream, PeerData *peer);
 PeerData *readPeer(int streamAppVersion, QDataStream &stream);
+QString peekUserPhone(int streamAppVersion, QDataStream &stream);
 
 } // namespace Serialize