Replace App::self() with Auth().user().

Always have self Auth().user() when AuthSession exists.

Telegram/Resources/langs/lang.strings

@@ -973,7 +973,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_auto_groups" = "Groups and channels";
 "lng_media_auto_play" = "Autoplay";
 
-"lng_emoji_category0" = "Frequently used";
 "lng_emoji_category1" = "People";
 "lng_emoji_category2" = "Nature";
 "lng_emoji_category3" = "Food & Drink";

Telegram/SourceFiles/apiwrap.cpp

@@ -557,8 +557,8 @@ void ApiWrap::requestContacts() {
 			if (contact.type() != mtpc_contact) continue;
 
 			const auto userId = contact.c_contact().vuser_id.v;
-			if (userId == _session->userId() && App::self()) {
+			if (userId == _session->userId()) {
-				App::self()->setContactStatus(
+				Auth().user()->setContactStatus(
 					UserData::ContactStatus::Contact);
 			}
 		}
@@ -763,7 +763,9 @@ void ApiWrap::requestFullPeer(PeerData *peer) {
 			_fullPeerRequests.remove(peer);
 		};
 		if (auto user = peer->asUser()) {
-			return request(MTPusers_GetFullUser(user->inputUser)).done([this, user](const MTPUserFull &result, mtpRequestId requestId) {
+			return request(MTPusers_GetFullUser(
+				user->inputUser
+			)).done([this, user](const MTPUserFull &result, mtpRequestId requestId) {
 				gotUserFull(user, result, requestId);
 			}).fail(failHandler).send();
 		} else if (auto chat = peer->asChat()) {
@@ -946,6 +948,13 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 void ApiWrap::gotUserFull(UserData *user, const MTPUserFull &result, mtpRequestId req) {
 	auto &d = result.c_userFull();
 
+	if (user == _session->user() && !_session->validateSelf(d.vuser)) {
+		constexpr auto kRequestUserAgainTimeout = TimeMs(10000);
+		App::CallDelayed(kRequestUserAgainTimeout, _session, [=] {
+			requestFullPeer(user);
+		});
+		return;
+	}
 	App::feedUsers(MTP_vector<MTPUser>(1, d.vuser));
 	if (d.has_profile_photo()) {
 		_session->data().photo(d.vprofile_photo);
@@ -1394,7 +1403,7 @@ void ApiWrap::requestSelfParticipant(ChannelData *channel) {
 			channel->inviter = _session->userId();
 			channel->inviteDate = channel->date;
 			if (channel->mgInfo) {
-				channel->mgInfo->creator = App::self();
+				channel->mgInfo->creator = Auth().user();
 			}
 		} break;
 		case mtpc_channelParticipantAdmin: {
@@ -2006,14 +2015,15 @@ void ApiWrap::updatePrivacyLastSeens(const QVector<MTPPrivacyRule> &rules) {
 	if (_contactsStatusesRequestId) {
 		request(_contactsStatusesRequestId).cancel();
 	}
-	_contactsStatusesRequestId = request(MTPcontacts_GetStatuses()).done([this](const MTPVector<MTPContactStatus> &result) {
+	_contactsStatusesRequestId = request(MTPcontacts_GetStatuses(
+	)).done([=](const MTPVector<MTPContactStatus> &result) {
 		_contactsStatusesRequestId = 0;
 		for_const (auto &item, result.v) {
 			Assert(item.type() == mtpc_contactStatus);
 			auto &data = item.c_contactStatus();
 			if (auto user = App::userLoaded(data.vuser_id.v)) {
 				auto oldOnlineTill = user->onlineTill;
-				auto newOnlineTill = onlineTillFromStatus(data.vstatus, oldOnlineTill);
+				auto newOnlineTill = OnlineTillFromStatus(data.vstatus, oldOnlineTill);
 				if (oldOnlineTill != newOnlineTill) {
 					user->onlineTill = newOnlineTill;
 					Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserOnlineChanged);
@@ -2025,10 +2035,14 @@ void ApiWrap::updatePrivacyLastSeens(const QVector<MTPPrivacyRule> &rules) {
 	}).send();
 }
 
-int ApiWrap::onlineTillFromStatus(const MTPUserStatus &status, int currentOnlineTill) {
+int ApiWrap::OnlineTillFromStatus(
+		const MTPUserStatus &status,
+		int currentOnlineTill) {
 	switch (status.type()) {
 	case mtpc_userStatusEmpty: return 0;
-	case mtpc_userStatusRecently: return (currentOnlineTill > -10) ? -2 : currentOnlineTill; // don't modify pseudo-online
+	case mtpc_userStatusRecently:
+		// Don't modify pseudo-online.
+		return (currentOnlineTill > -10) ? -2 : currentOnlineTill;
 	case mtpc_userStatusLastWeek: return -3;
 	case mtpc_userStatusLastMonth: return -4;
 	case mtpc_userStatusOffline: return status.c_userStatusOffline().vwas_online.v;
@@ -4892,11 +4906,7 @@ void ApiWrap::photoUploadReady(
 }
 
 void ApiWrap::clearPeerPhoto(not_null<PhotoData*> photo) {
-	const auto self = App::self();
+	const auto self = Auth().user();
-	if (!self) {
-		return;
-	}
-
 	if (self->userpicPhotoId() == photo->id) {
 		request(MTPphotos_UpdateProfilePhoto(
 			MTP_inputPhotoEmpty()
@@ -5005,7 +5015,7 @@ void ApiWrap::saveSelfBio(const QString &text, FnMut<void()> done) {
 		_saveBioRequestId = 0;
 
 		App::feedUsers(MTP_vector<MTPUser>(1, result));
-		App::self()->setAbout(_saveBioText);
+		Auth().user()->setAbout(_saveBioText);
 		if (_saveBioDone) {
 			_saveBioDone();
 		}

Telegram/SourceFiles/apiwrap.h

@@ -182,7 +182,9 @@ public:
 
 	void savePrivacy(const MTPInputPrivacyKey &key, QVector<MTPInputPrivacyRule> &&rules);
 	void handlePrivacyChange(mtpTypeId keyTypeId, const MTPVector<MTPPrivacyRule> &rules);
-	int onlineTillFromStatus(const MTPUserStatus &status, int currentOnlineTill);
+	static int OnlineTillFromStatus(
+		const MTPUserStatus &status,
+		int currentOnlineTill);
 
 	void clearHistory(not_null<PeerData*> peer);
 

Telegram/SourceFiles/app.cpp

@@ -49,8 +49,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace {
 	App::LaunchState _launchState = App::Launched;
 
-	UserData *self = nullptr;
-
 	std::unordered_map<PeerId, std::unique_ptr<PeerData>> peersData;
 
 	using LocationsData = QHash<LocationCoords, LocationData*>;
@@ -309,10 +307,6 @@ namespace App {
 					: data->phone().isEmpty()
 					? UserData::ContactStatus::PhoneUnknown
 					: UserData::ContactStatus::CanAdd);
-				if (d.is_self() && ::self != data) {
-					::self = data;
-					Global::RefSelfChanged().notify();
-				}
 			}
 
 			if (canShareThisContact != data->canShareThisContactFast()) {
@@ -334,8 +328,10 @@ namespace App {
 		}
 
 		if (status && !minimal) {
-			auto oldOnlineTill = data->onlineTill;
+			const auto oldOnlineTill = data->onlineTill;
-			auto newOnlineTill = Auth().api().onlineTillFromStatus(*status, oldOnlineTill);
+			const auto newOnlineTill = ApiWrap::OnlineTillFromStatus(
+				*status,
+				oldOnlineTill);
 			if (oldOnlineTill != newOnlineTill) {
 				data->onlineTill = newOnlineTill;
 				update.flags |= UpdateFlag::UserOnlineChanged;
@@ -344,7 +340,7 @@ namespace App {
 
 		if (data->contactStatus() == UserData::ContactStatus::PhoneUnknown
 			&& !data->phone().isEmpty()
-			&& data->id != Auth().userPeerId()) {
+			&& !data->isSelf()) {
 			data->setContactStatus(UserData::ContactStatus::CanAdd);
 		}
 		if (App::main()) {
@@ -918,7 +914,7 @@ namespace App {
 	}
 
 	void checkSavedGif(HistoryItem *item) {
-		if (!item->Has<HistoryMessageForwarded>() && (item->out() || item->history()->peer == App::self())) {
+		if (!item->Has<HistoryMessageForwarded>() && (item->out() || item->history()->peer == Auth().user())) {
 			if (const auto media = item->media()) {
 				if (const auto document = media->document()) {
 					if (document->isGifv()) {
@@ -1153,10 +1149,6 @@ namespace App {
 		}
 	}
 
-	UserData *self() {
-		return ::self;
-	}
-
 	PeerData *peerByName(const QString &username) {
 		const auto uname = username.trimmed();
 		for (const auto &[peerId, peer] : peersData) {
@@ -1294,8 +1286,6 @@ namespace App {
 		cSetAutoDownloadPhoto(0);
 		cSetAutoDownloadAudio(0);
 		cSetAutoDownloadGif(0);
-		::self = nullptr;
-		Global::RefSelfChanged().notify(true);
 	}
 
 	void historyRegDependency(HistoryItem *dependent, HistoryItem *dependency) {

Telegram/SourceFiles/app.h

@@ -135,7 +135,6 @@ namespace App {
 	void enumerateChatsChannels(
 		Fn<void(not_null<PeerData*>)> action);
 
-	UserData *self();
 	PeerData *peerByName(const QString &username);
 	QString peerName(const PeerData *peer, bool forDialogs = false);
 

Telegram/SourceFiles/auth_session.cpp

@@ -265,8 +265,8 @@ AuthSession &Auth() {
 	return *result;
 }
 
-AuthSession::AuthSession(UserId userId)
+AuthSession::AuthSession(const MTPUser &user)
-: _userId(userId)
+: _user(App::user(user.match([](const auto &data) { return data.vid.v; })))
 , _autoLockTimer([this] { checkAutoLock(); })
 , _api(std::make_unique<ApiWrap>(this))
 , _calls(std::make_unique<Calls::Instance>())
@@ -276,7 +276,7 @@ AuthSession::AuthSession(UserId userId)
 , _notifications(std::make_unique<Window::Notifications::System>(this))
 , _data(std::make_unique<Data::Session>(this))
 , _changelogs(Core::Changelogs::Create(this)) {
-	Expects(_userId != 0);
+	App::feedUser(user);
 
 	_saveDataTimer.setCallback([=] {
 		Local::writeUserSettings();
@@ -294,21 +294,18 @@ AuthSession::AuthSession(UserId userId)
 	});
 	_api->refreshProxyPromotion();
 	_api->requestTermsUpdate();
+	_api->requestFullPeer(_user);
 
 	Window::Theme::Background()->start();
 }
 
 bool AuthSession::Exists() {
-	if (auto messenger = Messenger::InstancePointer()) {
+	if (const auto messenger = Messenger::InstancePointer()) {
 		return (messenger->authSession() != nullptr);
 	}
 	return false;
 }
 
-UserData *AuthSession::user() const {
-	return App::user(userId());
-}
-
 base::Observable<void> &AuthSession::downloaderTaskFinished() {
 	return downloader().taskFinished();
 }

Telegram/SourceFiles/auth_session.h

@@ -186,7 +186,7 @@ class AuthSession final
 	: public base::has_weak_ptr
 	, private base::Subscriber {
 public:
-	AuthSession(UserId userId);
+	AuthSession(const MTPUser &user);
 
 	AuthSession(const AuthSession &other) = delete;
 	AuthSession &operator=(const AuthSession &other) = delete;
@@ -194,12 +194,14 @@ public:
 	static bool Exists();
 
 	UserId userId() const {
-		return _userId;
+		return _user->bareId();
 	}
 	PeerId userPeerId() const {
-		return peerFromUser(userId());
+		return _user->id;
+	}
+	not_null<UserData*> user() const {
+		return _user;
 	}
-	UserData *user() const;
 	bool validateSelf(const MTPUser &user);
 
 	Storage::Downloader &downloader() {
@@ -249,7 +251,7 @@ public:
 private:
 	static constexpr auto kDefaultSaveDelay = TimeMs(1000);
 
-	const UserId _userId = 0;
+	const not_null<UserData*> _user;
 	AuthSessionSettings _settings;
 	base::Timer _saveDataTimer;
 

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -416,7 +416,7 @@ void EditCaptionBox::save() {
 	};
 	const auto prepareFlags = Ui::ItemTextOptions(
 		item->history(),
-		App::self()).flags;
+		Auth().user()).flags;
 	TextUtilities::PrepareForSending(sending, prepareFlags);
 	TextUtilities::Trim(sending);
 

Telegram/SourceFiles/boxes/peer_list_controllers.cpp

@@ -263,10 +263,8 @@ void ChatsListBoxController::rebuildRows() {
 	};
 	auto added = 0;
 	if (respectSavedMessagesChat()) {
-		if (auto self = App::self()) {
+		if (appendRow(App::history(Auth().user()))) {
-			if (appendRow(App::history(self))) {
+			++added;
-				++added;
-			}
 		}
 	}
 	added += appendList(App::main()->dialogsList());

Telegram/SourceFiles/boxes/share_box.cpp

@@ -294,10 +294,9 @@ ShareBox::Inner::Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallbac
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
 	const auto dialogs = App::main()->dialogsList();
-	if (const auto self = App::self()) {
+	const auto self = Auth().user();
-		if (_filterCallback(App::self())) {
+	if (_filterCallback(self)) {
-			_chatsIndexed->addToEnd(App::history(self));
+		_chatsIndexed->addToEnd(App::history(self));
-		}
 	}
 	for (const auto row : dialogs->all()) {
 		if (const auto history = row->history()) {

Telegram/SourceFiles/boxes/username_box.cpp

@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "styles/style_boxes.h"
 #include "messenger.h"
+#include "auth_session.h"
 
 namespace {
 
@@ -24,14 +25,21 @@ constexpr auto kMinUsernameLength = 5;
 } // namespace
 
 UsernameBox::UsernameBox(QWidget*)
-: _username(this, st::defaultInputField, [] { return qsl("@username"); }, App::self()->username, false)
+: _username(
+	this,
+	st::defaultInputField,
+	[] { return qsl("@username"); },
+	Auth().user()->username,
+	false)
 , _link(this, QString(), st::boxLinkButton)
 , _about(st::boxWidth - st::usernamePadding.left())
 , _checkTimer(this) {
 }
 
 void UsernameBox::prepare() {
-	_goodText = App::self()->username.isEmpty() ? QString() : lang(lng_username_available);
+	_goodText = Auth().user()->username.isEmpty()
+		? QString()
+		: lang(lng_username_available);
 
 	setTitle(langFactory(lng_username_title));
 
@@ -170,9 +178,14 @@ bool UsernameBox::onUpdateFail(const RPCError &error) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
 	_saveRequestId = 0;
-	QString err(error.type());
+	const auto self = Auth().user();
-	if (err == qstr("USERNAME_NOT_MODIFIED") || _sentUsername == App::self()->username) {
+	const auto err = error.type();
-		App::self()->setName(TextUtilities::SingleLine(App::self()->firstName), TextUtilities::SingleLine(App::self()->lastName), TextUtilities::SingleLine(App::self()->nameOrPhone), TextUtilities::SingleLine(_sentUsername));
+	if (err == qstr("USERNAME_NOT_MODIFIED") || _sentUsername == self->username) {
+		self->setName(
+			TextUtilities::SingleLine(self->firstName),
+			TextUtilities::SingleLine(self->lastName),
+			TextUtilities::SingleLine(self->nameOrPhone),
+			TextUtilities::SingleLine(_sentUsername));
 		closeBox();
 		return true;
 	} else if (err == qstr("USERNAME_INVALID")) {
@@ -194,8 +207,13 @@ bool UsernameBox::onUpdateFail(const RPCError &error) {
 
 void UsernameBox::onCheckDone(const MTPBool &result) {
 	_checkRequestId = 0;
-	QString newError = (mtpIsTrue(result) || _checkUsername == App::self()->username) ? QString() : lang(lng_username_occupied);
+	const auto newError = (mtpIsTrue(result)
-	QString newGood = newError.isEmpty() ? lang(lng_username_available) : QString();
+		|| _checkUsername == Auth().user()->username)
+		? QString()
+		: lang(lng_username_occupied);
+	const auto newGood = newError.isEmpty()
+		? lang(lng_username_available)
+		: QString();
 	if (_errorText != newError || _goodText != newGood) {
 		_errorText = newError;
 		_goodText = newGood;
@@ -212,7 +230,7 @@ bool UsernameBox::onCheckFail(const RPCError &error) {
 		_errorText = lang(lng_username_invalid);
 		update();
 		return true;
-	} else if (err == qstr("USERNAME_OCCUPIED") && _checkUsername != App::self()->username) {
+	} else if (err == qstr("USERNAME_OCCUPIED") && _checkUsername != Auth().user()->username) {
 		_errorText = lang(lng_username_occupied);
 		update();
 		return true;

Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp

@@ -463,7 +463,7 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
 		if (info.section > 0 && r.top() < info.rowsTop) {
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st::emojiPanHeaderFg);
-			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(), lang(LangKey(lng_emoji_category0 + info.section)));
+			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(), lang(LangKey(lng_emoji_category1 + info.section - 1)));
 		}
 		if (r.top() + r.height() > info.rowsTop) {
 			ensureLoaded(info.section);

Telegram/SourceFiles/data/data_peer.cpp

@@ -437,8 +437,6 @@ void UserData::setName(const QString &newFirstName, const QString &newLastName,
 void UserData::setPhone(const QString &newPhone) {
 	if (_phone != newPhone) {
 		_phone = newPhone;
-		if (bareId() == Auth().userId()) {
-		}
 	}
 }
 
@@ -1042,15 +1040,16 @@ void ChannelData::setAdminRights(const MTPChannelAdminRights &rights) {
 	}
 	_adminRights.set(rights.c_channelAdminRights().vflags.v);
 	if (isMegagroup()) {
+		const auto self = Auth().user();
 		if (hasAdminRights()) {
 			if (!amCreator()) {
 				auto me = MegagroupInfo::Admin { rights };
 				me.canEdit = false;
-				mgInfo->lastAdmins.emplace(App::self(), me);
+				mgInfo->lastAdmins.emplace(self, me);
 			}
-			mgInfo->lastRestricted.remove(App::self());
+			mgInfo->lastRestricted.remove(self);
 		} else {
-			mgInfo->lastAdmins.remove(App::self());
+			mgInfo->lastAdmins.remove(self);
 		}
 
 		auto amAdmin = hasAdminRights() || amCreator();
@@ -1067,15 +1066,16 @@ void ChannelData::setRestrictedRights(const MTPChannelBannedRights &rights) {
 	_restrictedUntill = rights.c_channelBannedRights().vuntil_date.v;
 	_restrictions.set(rights.c_channelBannedRights().vflags.v);
 	if (isMegagroup()) {
+		const auto self = Auth().user();
 		if (hasRestrictions()) {
 			if (!amCreator()) {
 				auto me = MegagroupInfo::Restricted { rights };
-				mgInfo->lastRestricted.emplace(App::self(), me);
+				mgInfo->lastRestricted.emplace(self, me);
 			}
-			mgInfo->lastAdmins.remove(App::self());
+			mgInfo->lastAdmins.remove(self);
 			Data::ChannelAdminChanges(this).feed(Auth().userId(), false);
 		} else {
-			mgInfo->lastRestricted.remove(App::self());
+			mgInfo->lastRestricted.remove(self);
 		}
 	}
 	Notify::peerUpdatedDelayed(this, UpdateFlag::ChannelRightsChanged | UpdateFlag::AdminsChanged | UpdateFlag::BannedUsersChanged);

Telegram/SourceFiles/facades.cpp

@@ -119,7 +119,7 @@ void activateBotCommand(
 			Ui::showPeerHistory(history, ShowAtTheEndMsgId);
 			auto options = ApiWrap::SendOptions(history);
 			options.replyTo = msgId;
-			Auth().api().shareContact(App::self(), options);
+			Auth().api().shareContact(Auth().user(), options);
 		}));
 	} break;
 
@@ -551,8 +551,6 @@ struct Data {
 
 	CircleMasksMap CircleMasks;
 
-	base::Observable<void> SelfChanged;
-
 	bool AskDownloadPath = false;
 	QString DownloadPath;
 	QByteArray DownloadPathBookmark;
@@ -681,8 +679,6 @@ DefineVar(Global, Stickers::Order, ArchivedStickerSetsOrder);
 
 DefineRefVar(Global, CircleMasksMap, CircleMasks);
 
-DefineRefVar(Global, base::Observable<void>, SelfChanged);
-
 DefineVar(Global, bool, AskDownloadPath);
 DefineVar(Global, QString, DownloadPath);
 DefineVar(Global, QByteArray, DownloadPathBookmark);

Telegram/SourceFiles/facades.h

@@ -292,8 +292,6 @@ DeclareVar(HiddenPinnedMessagesMap, HiddenPinnedMessages);
 typedef QMap<uint64, QPixmap> CircleMasksMap;
 DeclareRefVar(CircleMasksMap, CircleMasks);
 
-DeclareRefVar(base::Observable<void>, SelfChanged);
-
 DeclareVar(bool, AskDownloadPath);
 DeclareVar(QString, DownloadPath);
 DeclareVar(QByteArray, DownloadPathBookmark);

Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp

@@ -411,7 +411,7 @@ void InnerWidget::requestAdmins() {
 			}
 		});
 		if (_admins.empty()) {
-			_admins.push_back(App::self());
+			_admins.push_back(Auth().user());
 		}
 		if (_showFilterCallback) {
 			showFilter(std::move(_showFilterCallback));

Telegram/SourceFiles/history/history_widget.cpp

@@ -2916,7 +2916,9 @@ void HistoryWidget::saveEditMsg() {
 			: WebPageId(0));
 
 	const auto textWithTags = _field->getTextWithAppliedMarkdown();
-	const auto prepareFlags = Ui::ItemTextOptions(_history, App::self()).flags;
+	const auto prepareFlags = Ui::ItemTextOptions(
+		_history, 
+		Auth().user()).flags;
 	auto sending = TextWithEntities();
 	auto left = TextWithEntities { textWithTags.text, ConvertTextTagsToEntities(textWithTags.tags) };
 	TextUtilities::PrepareForSending(left, prepareFlags);
@@ -4448,7 +4450,7 @@ void HistoryWidget::sendFileConfirmed(
 	};
 	const auto prepareFlags = Ui::ItemTextOptions(
 		history,
-		App::self()).flags;
+		Auth().user()).flags;
 	TextUtilities::PrepareForSending(caption, prepareFlags);
 	TextUtilities::Trim(caption);
 	auto localEntities = TextUtilities::EntitiesToMTP(caption.entities);

Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp

@@ -760,12 +760,13 @@ void TopBarWidget::updateOnlineDisplay() {
 				text = lng_chat_status_members(lt_count, chat->count);
 			}
 		} else {
+			const auto self = Auth().user();
 			auto online = 0;
 			auto onlyMe = true;
 			for (auto [user, v] : chat->participants) {
 				if (user->onlineTill > now) {
 					++online;
-					if (onlyMe && user != App::self()) onlyMe = false;
+					if (onlyMe && user != self) onlyMe = false;
 				}
 			}
 			if (online > 0 && !onlyMe) {
@@ -783,12 +784,13 @@ void TopBarWidget::updateOnlineDisplay() {
 			if (channel->mgInfo->lastParticipants.empty() || channel->lastParticipantsCountOutdated()) {
 				Auth().api().requestLastParticipants(channel);
 			}
+			const auto self = Auth().user();
 			auto online = 0;
-			bool onlyMe = true;
+			auto onlyMe = true;
 			for (auto &participant : std::as_const(channel->mgInfo->lastParticipants)) {
 				if (participant->onlineTill > now) {
 					++online;
-					if (onlyMe && participant != App::self()) {
+					if (onlyMe && participant != self) {
 						onlyMe = false;
 					}
 				}

Telegram/SourceFiles/intro/introwidget.cpp

@@ -594,7 +594,9 @@ QString Widget::Step::nextButtonText() const {
 }
 
 void Widget::Step::finish(const MTPUser &user, QImage &&photo) {
-	if (user.type() != mtpc_user || !user.c_user().is_self()) {
+	if (user.type() != mtpc_user
+		|| !user.c_user().is_self()
+		|| !user.c_user().vid.v) {
 		// No idea what to do here.
 		// We could've reset intro and MTP, but this really should not happen.
 		Ui::show(Box<InformBox>("Internal error: bad user.is_self() after sign in."));
@@ -610,16 +612,13 @@ void Widget::Step::finish(const MTPUser &user, QImage &&photo) {
 		Local::writeLangPack();
 	}
 
-	Messenger::Instance().authSessionCreate(user.c_user().vid.v);
+	Messenger::Instance().authSessionCreate(user);
 	Local::writeMtpData();
-	App::wnd()->setupMain(&user);
+	App::wnd()->setupMain();
 
 	// "this" is already deleted here by creating the main widget.
-	if (const auto user = App::self()) {
+	if (AuthSession::Exists() && !photo.isNull()) {
-		Auth().api().requestFullPeer(user);
+		Auth().api().uploadPeerPhoto(Auth().user(), std::move(photo));
-		if (!photo.isNull()) {
-			Auth().api().uploadPeerPhoto(user, std::move(photo));
-		}
 	}
 }
 

Telegram/SourceFiles/mainwidget.cpp

@@ -1112,7 +1112,12 @@ void MainWidget::deleteConversation(
 
 void MainWidget::deleteAndExit(ChatData *chat) {
 	PeerData *peer = chat;
-	MTP::send(MTPmessages_DeleteChatUser(chat->inputChat, App::self()->inputUser), rpcDone(&MainWidget::deleteHistoryAfterLeave, peer), rpcFail(&MainWidget::leaveChatFailed, peer));
+	MTP::send(
+		MTPmessages_DeleteChatUser(
+			chat->inputChat,
+			Auth().user()->inputUser),
+		rpcDone(&MainWidget::deleteHistoryAfterLeave, peer),
+		rpcFail(&MainWidget::leaveChatFailed, peer));
 }
 
 void MainWidget::addParticipants(
@@ -3647,26 +3652,13 @@ void MainWidget::mtpPing() {
 	MTP::ping();
 }
 
-void MainWidget::start(const MTPUser *self) {
+void MainWidget::start() {
 	Auth().api().requestNotifySettings(MTP_inputNotifyUsers());
 	Auth().api().requestNotifySettings(MTP_inputNotifyChats());
 
-	if (!self) {
-		MTP::send(MTPusers_GetFullUser(MTP_inputUserSelf()), rpcDone(&MainWidget::startWithSelf));
-		return;
-	} else if (!Auth().validateSelf(*self)) {
-		constexpr auto kRequestUserAgainTimeout = TimeMs(10000);
-		App::CallDelayed(kRequestUserAgainTimeout, this, [=] {
-			MTP::send(MTPusers_GetFullUser(MTP_inputUserSelf()), rpcDone(&MainWidget::startWithSelf));
-		});
-		return;
-	}
-
 	Local::readSavedPeers();
 	cSetOtherOnline(0);
-	if (const auto user = App::feedUsers(MTP_vector<MTPUser>(1, *self))) {
+	Auth().user()->loadUserpic();
-		user->loadUserpic();
-	}
 
 	MTP::send(MTPupdates_GetState(), rpcDone(&MainWidget::gotState));
 	update();
@@ -3938,15 +3930,6 @@ bool MainWidget::inviteImportFail(const RPCError &error) {
 	return true;
 }
 
-void MainWidget::startWithSelf(const MTPUserFull &result) {
-	Expects(result.type() == mtpc_userFull);
-	auto &d = result.c_userFull();
-	start(&d.vuser);
-	if (auto user = App::self()) {
-		Auth().api().processFullPeer(user, result);
-	}
-}
-
 void MainWidget::incrementSticker(DocumentData *sticker) {
 	if (!sticker || !sticker->sticker()) return;
 	if (sticker->sticker()->set.type() == mtpc_inputStickerSetEmpty) return;
@@ -4145,12 +4128,11 @@ void MainWidget::updateOnline(bool gotOtherOffline) {
 		_lastSetOnline = ms;
 		_onlineRequest = MTP::send(MTPaccount_UpdateStatus(MTP_bool(!isOnline)));
 
-		if (App::self()) {
+		const auto self = Auth().user();
-			App::self()->onlineTill = unixtime() + (isOnline ? (Global::OnlineUpdatePeriod() / 1000) : -1);
+		self->onlineTill = unixtime() + (isOnline ? (Global::OnlineUpdatePeriod() / 1000) : -1);
-			Notify::peerUpdatedDelayed(
+		Notify::peerUpdatedDelayed(
-				App::self(),
+			self,
-				Notify::PeerUpdate::Flag::UserOnlineChanged);
+			Notify::PeerUpdate::Flag::UserOnlineChanged);
-		}
 		if (!isOnline) { // Went offline, so we need to save message draft to the cloud.
 			saveDraftToCloud();
 		}

Telegram/SourceFiles/mainwidget.h

@@ -95,7 +95,7 @@ public:
 
 	void showAnimated(const QPixmap &bgAnimCache, bool back = false);
 
-	void start(const MTPUser *self = nullptr);
+	void start();
 
 	void openPeerByName(
 		const QString &name,
@@ -443,8 +443,6 @@ private:
 	Window::SectionSlideParams prepareHistoryAnimation(PeerId historyPeerId);
 	Window::SectionSlideParams prepareDialogsAnimation();
 
-	void startWithSelf(const MTPUserFull &user);
-
 	void saveSectionInStack();
 
 	void getChannelDifference(ChannelData *channel, ChannelDifferenceRequest from = ChannelDifferenceRequest::Unknown);

Telegram/SourceFiles/mainwindow.cpp

@@ -79,7 +79,9 @@ MainWindow::MainWindow() {
 
 	setLocale(QLocale(QLocale::English, QLocale::UnitedStates));
 
-	subscribe(Global::RefSelfChanged(), [this] { updateGlobalMenu(); });
+	subscribe(Messenger::Instance().authSessionChanged(), [this] {
+		updateGlobalMenu();
+	});
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &data) {
 		themeUpdated(data);
 	});
@@ -277,7 +279,7 @@ void MainWindow::sendServiceHistoryRequest() {
 		_main->rpcFail(&MainWidget::serviceHistoryFail));
 }
 
-void MainWindow::setupMain(const MTPUser *self) {
+void MainWindow::setupMain() {
 	Expects(AuthSession::Exists());
 
 	auto animated = (_intro || _passcodeLock);
@@ -294,7 +296,7 @@ void MainWindow::setupMain(const MTPUser *self) {
 	} else {
 		_main->activate();
 	}
-	_main->start(self);
+	_main->start();
 
 	fixOrder();
 }
@@ -606,7 +608,7 @@ void MainWindow::updateTrayMenu(bool force) {
 void MainWindow::onShowAddContact() {
 	if (isHidden()) showFromTray();
 
-	if (App::self()) {
+	if (AuthSession::Exists()) {
 		Ui::show(Box<AddContactBox>(), LayerOption::KeepOther);
 	}
 }
@@ -614,7 +616,7 @@ void MainWindow::onShowAddContact() {
 void MainWindow::onShowNewGroup() {
 	if (isHidden()) showFromTray();
 
-	if (App::self()) {
+	if (AuthSession::Exists()) {
 		Ui::show(
 			Box<GroupInfoBox>(CreatingGroupGroup, false),
 			LayerOption::KeepOther);

Telegram/SourceFiles/mainwindow.h

@@ -52,7 +52,7 @@ public:
 	void setupPasscodeLock();
 	void clearPasscodeLock();
 	void setupIntro();
-	void setupMain(const MTPUser *user = nullptr);
+	void setupMain();
 	void serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media = MTP_messageMediaEmpty(), int32 date = 0, bool force = false);
 	void sendServiceHistoryRequest();
 	void showDelayedServiceMsgs();

Telegram/SourceFiles/media/player/media_player_instance.cpp

@@ -54,11 +54,6 @@ Instance::Instance()
 	subscribe(Media::Player::Updated(), [this](const AudioMsgId &audioId) {
 		handleSongUpdate(audioId);
 	});
-	subscribe(Global::RefSelfChanged(), [this] {
-		if (!App::self()) {
-			handleLogout();
-		}
-	});
 
 	// While we have one Media::Player::Instance for all authsessions we have to do this.
 	auto handleAuthSessionChange = [this] {
@@ -69,9 +64,11 @@ Instance::Instance()
 					pause(AudioMsgId::Type::Song);
 				}
 			});
+		} else {
+			handleLogout();
 		}
 	};
-	subscribe(Messenger::Instance().authSessionChanged(), [handleAuthSessionChange] {
+	subscribe(Messenger::Instance().authSessionChanged(), [=] {
 		handleAuthSessionChange();
 	});
 	handleAuthSessionChange();

Telegram/SourceFiles/mediaview.cpp

@@ -442,7 +442,7 @@ void MediaView::updateActions() {
 	auto canDelete = [&] {
 		if (_canDeleteItem) {
 			return true;
-		} else if (!_msgid && _photo && App::self() && _user == App::self()) {
+		} else if (!_msgid && _photo && _user && _user == Auth().user()) {
 			return _userPhotosData && _fullIndex && _fullCount;
 		} else if (_photo && _photo->peer && _photo->peer->userpicPhotoId() == _photo->id) {
 			if (auto chat = _photo->peer->asChat()) {

Telegram/SourceFiles/messenger.cpp

@@ -66,6 +66,7 @@ Messenger *Messenger::InstancePointer() {
 
 struct Messenger::Private {
 	UserId authSessionUserId = 0;
+	QByteArray authSessionUserSerialized;
 	std::unique_ptr<AuthSessionSettings> storedAuthSession;
 	MTP::Instance::Config mtpConfig;
 	MTP::AuthKeysList mtpKeysToDestroy;
@@ -454,7 +455,21 @@ void Messenger::startMtp() {
 	}
 
 	if (_private->authSessionUserId) {
-		authSessionCreate(base::take(_private->authSessionUserId));
+		authSessionCreate(MTP_user(
+			MTP_flags(MTPDuser::Flag::f_self),
+			MTP_int(base::take(_private->authSessionUserId)),
+			MTPlong(), // access_hash
+			MTPstring(), // first_name
+			MTPstring(), // last_name
+			MTPstring(), // username
+			MTPstring(), // phone
+			MTPUserProfilePhoto(),
+			MTPUserStatus(),
+			MTPint(), // bot_info_version
+			MTPstring(), // restriction_reason
+			MTPstring(), // bot_inline_placeholder
+			MTPstring())); // lang_code
+		//Local::readUser(base::take(_private->authSessionUserSerialized));
 	}
 	if (_private->storedAuthSession) {
 		if (_authSession) {
@@ -538,15 +553,8 @@ void Messenger::startLocalStorage() {
 	});
 	subscribe(authSessionChanged(), [this] {
 		InvokeQueued(this, [this] {
-			if (_mtproto) {
+			const auto phone = AuthSession::Exists()
-				_mtproto->requestConfig();
+				? Auth().user()->phone()
-			}
-		});
-	});
-	subscribe(Global::RefSelfChanged(), [=] {
-		InvokeQueued(this, [=] {
-			const auto phone = App::self()
-				? App::self()->phone()
 				: QString();
 			if (cLoggedPhoneNumber() != phone) {
 				cSetLoggedPhoneNumber(phone);
@@ -555,6 +563,9 @@ void Messenger::startLocalStorage() {
 				}
 				Local::writeSettings();
 			}
+			if (_mtproto) {
+				_mtproto->requestConfig();
+			}
 		});
 	});
 }
@@ -689,10 +700,10 @@ void Messenger::onSwitchTestMode() {
 	App::restart();
 }
 
-void Messenger::authSessionCreate(UserId userId) {
+void Messenger::authSessionCreate(const MTPUser &user) {
 	Expects(_mtproto != nullptr);
 
-	_authSession = std::make_unique<AuthSession>(userId);
+	_authSession = std::make_unique<AuthSession>(user);
 	authSessionChanged().notify(true);
 }
 
@@ -702,6 +713,7 @@ void Messenger::authSessionDestroy() {
 	_authSession.reset();
 	_private->storedAuthSession.reset();
 	_private->authSessionUserId = 0;
+	_private->authSessionUserSerialized = {};
 	authSessionChanged().notify(true);
 }
 

Telegram/SourceFiles/messenger.h

@@ -144,7 +144,7 @@ public:
 	Lang::CloudManager *langCloudManager() {
 		return _langCloudManager.get();
 	}
-	void authSessionCreate(UserId userId);
+	void authSessionCreate(const MTPUser &user);
 	base::Observable<void> &authSessionChanged() {
 		return _authSessionChanged;
 	}

Telegram/SourceFiles/old_settings/settings_cover.cpp

@@ -30,7 +30,7 @@ namespace OldSettings {
 
 CoverWidget::CoverWidget(QWidget *parent, UserData *self)
 : BlockWidget(parent, self, QString())
-, _self(App::self())
+, _self(self)
 , _userpicButton(
 	this,
 	App::wnd()->controller(),

Telegram/SourceFiles/old_settings/settings_info_widget.cpp

@@ -115,8 +115,8 @@ void InfoWidget::refreshBio() {
 		TextWithEntities(),
 		QString());
 	if (auto text = _bio->entity()->textLabel()) {
-		text->setClickHandlerFilter([](auto&&...) {
+		text->setClickHandlerFilter([=](auto&&...) {
-			Ui::show(Box<EditBioBox>(App::self()));
+			Ui::show(Box<EditBioBox>(self()));
 			return false;
 		});
 	}

Telegram/SourceFiles/old_settings/settings_inner_widget.cpp

@@ -19,19 +19,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "old_settings/settings_background_widget.h"
 #include "old_settings/settings_privacy_widget.h"
 #include "old_settings/settings_advanced_widget.h"
+#include "auth_session.h"
 
 namespace OldSettings {
 
 InnerWidget::InnerWidget(QWidget *parent) : LayerInner(parent)
 , _blocks(this)
-, _self(App::self()) {
+, _self(AuthSession::Exists() ? Auth().user().get() : nullptr) {
 	refreshBlocks();
-	subscribe(Global::RefSelfChanged(), [this] { fullRebuild(); });
 	subscribe(Lang::Current().updated(), [this] { fullRebuild(); });
 }
 
 void InnerWidget::fullRebuild() {
-	_self = App::self();
+	_self = AuthSession::Exists() ? Auth().user().get() : nullptr;
 	refreshBlocks();
 }
 

Telegram/SourceFiles/passport/passport_form_controller.cpp

@@ -1579,10 +1579,7 @@ QString FormController::defaultEmail() const {
 }
 
 QString FormController::defaultPhoneNumber() const {
-	if (const auto self = App::self()) {
+	return Auth().user()->phone();
-		return self->phone();
-	}
-	return QString();
 }
 
 auto FormController::scanUpdated() const

Telegram/SourceFiles/passport/passport_panel_details_row.cpp

@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/countryinput.h"
+#include "auth_session.h"
 #include "styles/style_boxes.h"
 #include "styles/style_passport.h"
 
@@ -377,7 +378,8 @@ void CountryRow::errorAnimationCallback() {
 void CountryRow::chooseCountry() {
 	const auto top = _value.current();
 	const auto name = CountrySelectBox::NameByISO(top);
-	const auto isoByPhone = CountrySelectBox::ISOByPhone(App::self()->phone());
+	const auto isoByPhone = CountrySelectBox::ISOByPhone(
+		Auth().user()->phone());
 	const auto box = _controller->show(Box<CountrySelectBox>(!name.isEmpty()
 		? top
 		: !isoByPhone.isEmpty()

Telegram/SourceFiles/platform/mac/main_window_mac.mm

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwidget.h"
 #include "application.h"
 #include "messenger.h"
+#include "auth_session.h"
 #include "history/history.h"
 #include "history/history_widget.h"
 #include "history/history_inner_widget.h"
@@ -605,7 +606,7 @@ void MainWindow::createGlobalMenu() {
 	connect(psContacts, &QAction::triggered, psContacts, [] {
 		if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray();
 
-		if (!App::self()) return;
+		if (!AuthSession::Exists()) return;
 		Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(), [](not_null<PeerListBox*> box) {
 			box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
 			box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); });
@@ -695,7 +696,7 @@ void MainWindow::updateGlobalMenuHook() {
 		canDelete = list->canDeleteSelected();
 	}
 	App::wnd()->updateIsActive(0);
-	const auto logged = !!App::self();
+	const auto logged = AuthSession::Exists();
 	const auto locked = !Messenger::Instance().locked();
 	const auto inactive = !logged || locked;
 	_forceDisabled(psLogout, !logged && !locked);

Telegram/SourceFiles/profile/profile_block_group_members.cpp

@@ -343,7 +343,7 @@ void GroupMembersWidget::refreshLimitReached() {
 void GroupMembersWidget::checkSelfAdmin(ChatData *chat) {
 	if (chat->participants.empty()) return;
 
-	auto self = App::self();
+	const auto self = Auth().user();
 	if (chat->amAdmin() && !chat->admins.contains(self)) {
 		chat->admins.insert(self);
 	} else if (!chat->amAdmin() && chat->admins.contains(self)) {
@@ -404,7 +404,7 @@ void GroupMembersWidget::fillChatMembers(ChatData *chat) {
 	_sortByOnline = true;
 
 	reserveItemsForSize(chat->participants.size());
-	addUser(chat, App::self())->onlineForSort
+	addUser(chat, Auth().user())->onlineForSort
 		= std::numeric_limits<TimeId>::max();
 	for (auto [user, v] : chat->participants) {
 		if (!user->isSelf()) {
@@ -454,7 +454,7 @@ void GroupMembersWidget::fillMegagroupMembers(ChannelData *megagroup) {
 		clearItems();
 		reserveItemsForSize(membersList.size());
 		if (megagroup->amIn()) {
-			addUser(megagroup, App::self())->onlineForSort
+			addUser(megagroup, Auth().user())->onlineForSort
 				= std::numeric_limits<TimeId>::max();
 		}
 	} else if (membersList.size() >= itemsCount()) {

Telegram/SourceFiles/profile/profile_channel_controllers.cpp

@@ -801,7 +801,7 @@ void ParticipantsBoxController::editAdminDone(
 		}
 	} else {
 		// It won't be replaced if the entry already exists.
-		_additional.adminPromotedBy.emplace(user, App::self());
+		_additional.adminPromotedBy.emplace(user, Auth().user());
 		_additional.adminCanEdit.emplace(user);
 		_additional.adminRights[user] = rights;
 		_additional.kicked.erase(user);
@@ -859,7 +859,7 @@ void ParticipantsBoxController::editRestrictedDone(not_null<UserData*> user, con
 		_additional.adminRights.erase(user);
 		_additional.adminCanEdit.erase(user);
 		_additional.adminPromotedBy.erase(user);
-		_additional.restrictedBy.emplace(user, App::self());
+		_additional.restrictedBy.emplace(user, Auth().user());
 		if (fullBanned) {
 			_additional.kicked.emplace(user);
 			_additional.restrictedRights.erase(user);
@@ -1472,7 +1472,7 @@ void AddParticipantBoxController::editAdminDone(
 		_additional.adminCanEdit.emplace(user);
 		auto it = _additional.adminPromotedBy.find(user);
 		if (it == _additional.adminPromotedBy.end()) {
-			_additional.adminPromotedBy.emplace(user, App::self());
+			_additional.adminPromotedBy.emplace(user, Auth().user());
 		}
 	}
 	if (_adminDoneCallback) {
@@ -1557,7 +1557,7 @@ void AddParticipantBoxController::editRestrictedDone(
 		} else {
 			_additional.kicked.erase(user);
 		}
-		_additional.restrictedBy.emplace(user, App::self());
+		_additional.restrictedBy.emplace(user, Auth().user());
 	}
 	if (_bannedDoneCallback) {
 		_bannedDoneCallback(user, rights);

Telegram/SourceFiles/settings/settings_information.cpp

@@ -208,14 +208,18 @@ BioManager SetupBio(
 			geometry.y() + style->textMargins.top());
 	}, countdown->lifetime());
 
+	const auto assign = [=](QString text) {
+		auto position = bio->textCursor().position();
+		bio->setText(text.replace('\n', ' '));
+		auto cursor = bio->textCursor();
+		cursor.setPosition(position);
+		bio->setTextCursor(cursor);
+	};
 	const auto updated = [=] {
 		auto text = bio->getLastText();
 		if (text.indexOf('\n') >= 0) {
-			auto position = bio->textCursor().position();
+			assign(text);
-			bio->setText(text.replace('\n', ' '));
+			text = bio->getLastText();
-			auto cursor = bio->textCursor();
-			cursor.setPosition(position);
-			bio->setTextCursor(cursor);
 		}
 		changed->fire(*current != text);
 		const auto countLeft = qMax(kMaxBioLength - text.size(), 0);
@@ -230,8 +234,14 @@ BioManager SetupBio(
 	Info::Profile::BioValue(
 		self
 	) | rpl::start_with_next([=](const TextWithEntities &text) {
+		const auto wasChanged = (*current != bio->getLastText());
 		*current = text.text;
-		changed->fire(*current != bio->getLastText());
+		if (wasChanged) {
+			changed->fire(*current != bio->getLastText());
+		} else {
+			assign(text.text);
+			*current = bio->getLastText();
+		}
 	}, bio->lifetime());
 
 	bio->setMaxLength(kMaxBioLength);

Telegram/SourceFiles/ui/widgets/input_fields.cpp

@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "numbers.h"
+#include "auth_session.h"
 #include "messenger.h"
 
 namespace Ui {
@@ -4122,10 +4123,11 @@ void PhoneInput::focusInEvent(QFocusEvent *e) {
 
 void PhoneInput::clearText() {
 	QString phone;
-	if (App::self()) {
+	if (AuthSession::Exists()) {
-		QVector<int> newPattern = phoneNumberParse(App::self()->phone());
+		const auto self = Auth().user();
+		QVector<int> newPattern = phoneNumberParse(self->phone());
 		if (!newPattern.isEmpty()) {
-			phone = App::self()->phone().mid(0, newPattern.at(0));
+			phone = self->phone().mid(0, newPattern.at(0));
 		}
 	}
 	setText(phone);

Telegram/SourceFiles/window/window_controller.cpp

@@ -478,17 +478,18 @@ void Navigation::showPeerInfo(
 void Navigation::showSettings(
 		Settings::Type type,
 		const SectionShow &params) {
-	const auto self = App::self();
+	if (AuthSession::Exists()) {
-	if (!self) {
+		showSection(
+			Info::Memento(
+				Info::Settings::Tag{ Auth().user() },
+				Info::Section(type)),
+			params);
+	} else {
 		// #TODO settings
 		App::wnd()->showSpecialLayer(
 			Box<OldSettings::Widget>(),
 			params.animated);
-		return;
 	}
-	showSection(
-		Info::Memento(Info::Settings::Tag{ self }, Info::Section(type)),
-		params);
 }
 
 void Navigation::showSettings(const SectionShow &params) {

Telegram/SourceFiles/window/window_main_menu.cpp

@@ -38,10 +38,20 @@ MainMenu::MainMenu(
 , _version(this, st::mainMenuVersionLabel) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
-	subscribe(Global::RefSelfChanged(), [this] {
+	auto showSelfChat = [] {
-		checkSelf();
+		App::main()->choosePeer(Auth().userPeerId(), ShowAtUnreadMsgId);
-	});
+	};
-	checkSelf();
+	_userpicButton.create(
+		this,
+		_controller,
+		Auth().user(),
+		Ui::UserpicButton::Role::Custom,
+		st::mainMenuUserpic);
+	_userpicButton->setClickedCallback(showSelfChat);
+	_userpicButton->show();
+	_cloudButton.create(this, st::mainMenuCloudButton);
+	_cloudButton->setClickedCallback(showSelfChat);
+	_cloudButton->show();
 
 	_nightThemeSwitch.setCallback([this] {
 		if (const auto action = *_nightThemeAction) {
@@ -120,32 +130,6 @@ void MainMenu::refreshMenu() {
 	updatePhone();
 }
 
-void MainMenu::checkSelf() {
-	if (auto self = App::self()) {
-		auto showSelfChat = [] {
-			if (auto self = App::self()) {
-				App::main()->choosePeer(self->id, ShowAtUnreadMsgId);
-			}
-		};
-		_userpicButton.create(
-			this,
-			_controller,
-			self,
-			Ui::UserpicButton::Role::Custom,
-			st::mainMenuUserpic);
-		_userpicButton->setClickedCallback(showSelfChat);
-		_userpicButton->show();
-		_cloudButton.create(this, st::mainMenuCloudButton);
-		_cloudButton->setClickedCallback(showSelfChat);
-		_cloudButton->show();
-		update();
-		updateControlsGeometry();
-	} else {
-		_userpicButton.destroy();
-		_cloudButton.destroy();
-	}
-}
-
 void MainMenu::resizeEvent(QResizeEvent *e) {
 	_menu->setForceWidth(width());
 	updateControlsGeometry();
@@ -164,11 +148,7 @@ void MainMenu::updateControlsGeometry() {
 }
 
 void MainMenu::updatePhone() {
-	if (auto self = App::self()) {
+	_phoneText = App::formatPhone(Auth().user()->phone());
-		_phoneText = App::formatPhone(self->phone());
-	} else {
-		_phoneText = QString();
-	}
 	update();
 }
 
@@ -180,11 +160,14 @@ void MainMenu::paintEvent(QPaintEvent *e) {
 		p.fillRect(cover, st::mainMenuCoverBg);
 		p.setPen(st::mainMenuCoverFg);
 		p.setFont(st::semiboldFont);
-		if (auto self = App::self()) {
+		Auth().user()->nameText.drawLeftElided(
-			self->nameText.drawLeftElided(p, st::mainMenuCoverTextLeft, st::mainMenuCoverNameTop, width() - 2 * st::mainMenuCoverTextLeft, width());
+			p,
-			p.setFont(st::normalFont);
+			st::mainMenuCoverTextLeft,
-			p.drawTextLeft(st::mainMenuCoverTextLeft, st::mainMenuCoverStatusTop, width(), _phoneText);
+			st::mainMenuCoverNameTop,
-		}
+			width() - 2 * st::mainMenuCoverTextLeft,
+			width());
+		p.setFont(st::normalFont);
+		p.drawTextLeft(st::mainMenuCoverTextLeft, st::mainMenuCoverStatusTop, width(), _phoneText);
 		if (_cloudButton) {
 			Ui::EmptyUserpic::PaintSavedMessages(
 				p,

Telegram/SourceFiles/window/window_main_menu.h

@@ -33,7 +33,6 @@ protected:
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
-	void checkSelf();
 	void updateControlsGeometry();
 	void updatePhone();
 	void refreshMenu();

Telegram/SourceFiles/window/window_peer_menu.cpp

@@ -352,7 +352,7 @@ void Filler::addUserActions(not_null<UserData*> user) {
 	_addAction(
 		lang(lng_profile_clear_history),
 		ClearHistoryHandler(user));
-	if (!user->isInaccessible() && user != App::self()) {
+	if (!user->isInaccessible() && user != Auth().user()) {
 		addBlockUser(user);
 	}
 }