void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-08 08:04:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix loading locally stored self data.

Browse source
This commit is contained in:
John Preston 2020-06-30 11:16:47 +04:00
parent 87eaab15b5
commit dfc1712043
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Telegram/SourceFiles/storage/serialize_peer.cpp
View file

@ -204,8 +204,9 @@ PeerData *readPeer(
const auto loaded = (peerId == selfId) const auto loaded = (peerId == selfId)
? session->user().get() ? session->user().get()
: session->data().peerLoaded(peerId); : session->data().peerLoaded(peerId);
const auto apply = (loaded->loadedStatus != PeerData::FullLoaded);
const auto result = loaded ? loaded : session->data().peer(peerId).get(); const auto result = loaded ? loaded : session->data().peer(peerId).get();
if (!loaded) { if (apply) {
result->loadedStatus = PeerData::FullLoaded; result->loadedStatus = PeerData::FullLoaded;
} }
if (const auto user = result->asUser()) { if (const auto user = result->asUser()) {
@ -230,7 +231,7 @@ PeerData *readPeer(
? App::formatPhone(phone) ? App::formatPhone(phone)
: QString(); : QString();
if (!loaded) { if (apply) {
user->setPhone(phone); user->setPhone(phone);
user->setName(first, last, pname, username); user->setName(first, last, pname, username);
@ -268,7 +269,7 @@ PeerData *readPeer(
if (oldForbidden) { if (oldForbidden) {
flags |= quint32(MTPDchat_ClientFlag::f_forbidden); flags |= quint32(MTPDchat_ClientFlag::f_forbidden);
} }
if (!loaded) { if (apply) {
chat->setName(name); chat->setName(name);
chat->count = count; chat->count = count;
chat->date = date; chat->date = date;
@ -296,7 +297,7 @@ PeerData *readPeer(
if (oldForbidden) { if (oldForbidden) {
flags |= quint32(MTPDchannel_ClientFlag::f_forbidden); flags |= quint32(MTPDchannel_ClientFlag::f_forbidden);
} }
if (!loaded) { if (apply) {
channel->setName(name, QString()); channel->setName(name, QString());
channel->access = access; channel->access = access;
channel->date = date; channel->date = date;
@ -312,7 +313,7 @@ PeerData *readPeer(
channel->inputChannel = MTP_inputChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access)); channel->inputChannel = MTP_inputChannel(MTP_int(peerToChannel(channel->id)), MTP_long(access));
} }
} }
if (!loaded) { if (apply) {
using LocationType = StorageFileLocation::Type; using LocationType = StorageFileLocation::Type;
const auto location = (userpic->valid() && userpic->isLegacy()) const auto location = (userpic->valid() && userpic->isLegacy())
? userpic->convertToModern( ? userpic->convertToModern(