mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

Remove some more Auth() calls.

Browse Source
This commit is contained in:
John Preston
2020-06-08 13:06:50 +04:00
parent bede709f6b
commit 3878a1b212
67 changed files with 380 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/info/info_controller.cpp
View File

@@ -25,19 +25,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_session_controller.h"
namespace Info {
namespace {
not_null<PeerData*> CorrectPeer(PeerId peerId) {
Expects(peerId != 0);
const auto result = Auth().data().peer(peerId);
if (const auto to = result->migrateTo()) {
return to;
}
return result;
}
} // namespace
Key::Key(not_null<PeerData*> peer) : _value(peer) {
}
@@ -91,10 +78,13 @@ rpl::producer<SparseIdsMergedSlice> AbstractController::mediaSource(
SparseIdsMergedSlice::UniversalMsgId aroundId,
int limitBefore,
int limitAfter) const {
Expects(peer() != nullptr);
return SharedMediaMergedViewer(
&session(),
SharedMediaMergedKey(
SparseIdsMergedSlice::Key(
peerId(),
peer()->id,
migratedPeerId(),
aroundId),
section().mediaType()),
@@ -112,11 +102,8 @@ AbstractController::AbstractController(
, _parent(parent) {
}
PeerId AbstractController::peerId() const {
if (const auto peer = key().peer()) {
return peer->id;
}
return PeerId(0);
PeerData *AbstractController::peer() const {
return key().peer();
}
PeerId AbstractController::migratedPeerId() const {
@@ -154,7 +141,7 @@ Controller::Controller(
, _widget(widget)
, _key(memento->key())
, _migrated(memento->migratedPeerId()
? Auth().data().peer(memento->migratedPeerId()).get()
? window->session().data().peer(memento->migratedPeerId()).get()
: nullptr)
, _section(memento->section()) {
updateSearchControllers(memento);
@@ -175,7 +162,7 @@ void Controller::setupMigrationViewer() {
const auto section = _section;
InvokeQueued(_widget, [=] {
window->showSection(
Memento(peer->id, section),
Memento(peer, section),
Window::SectionShow(
Window::SectionShow::Way::Backward,
anim::type::instant,
@@ -195,7 +182,7 @@ rpl::producer<Wrap> Controller::wrapValue() const {
bool Controller::validateMementoPeer(
not_null<ContentMemento*> memento) const {
return memento->peerId() == peerId()
return memento->peer() == peer()
&& memento->migratedPeerId() == migratedPeerId()
//&& memento->feed() == feed() // #feed
&& memento->settingsSelf() == settingsSelf();
@@ -313,6 +300,7 @@ rpl::producer<SparseIdsMergedSlice> Controller::mediaSource(
}
return SharedMediaMergedViewer(
&session(),
SharedMediaMergedKey(
SparseIdsMergedSlice::Key(
query.peerId,