procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move non-settings session data to Data::Session. 

Rename AuthSessionData to AuthSessionSettings, move data away.
This commit is contained in:
John Preston 2018-01-04 13:22:53 +03:00
parent 724fe65d72
commit 6a9556d42c
51 changed files with 574 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/apiwrap.cpp
View File

@ -36,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_sparse_ids.h" #include "data/data_sparse_ids.h"
#include "data/data_search_controller.h" #include "data/data_search_controller.h"
#include "data/data_channel_admins.h" #include "data/data_channel_admins.h"
#include "data/data_session.h"
namespace { namespace {

1
Telegram/SourceFiles/app.cpp
View File

@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "data/data_abstract_structure.h" #include "data/data_abstract_structure.h"
#include "data/data_session.h"
#include "history/history_service_layout.h" #include "history/history_service_layout.h"
#include "history/history_location_manager.h" #include "history/history_location_manager.h"
#include "history/history_media_types.h" #include "history/history_media_types.h"

206
Telegram/SourceFiles/auth_session.cpp
View File

@ -15,8 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "storage/storage_facade.h" #include "storage/storage_facade.h"
#include "storage/serialize_common.h" #include "storage/serialize_common.h"
#include "data/data_feed.h" #include "data/data_session.h"
#include "history/history_item_components.h"
#include "window/notifications_manager.h" #include "window/notifications_manager.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
@ -24,7 +23,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/section_widget.h" #include "window/section_widget.h"
#include "chat_helpers/tabbed_selector.h" #include "chat_helpers/tabbed_selector.h"
#include "boxes/send_files_box.h" #include "boxes/send_files_box.h"
#include "observer_peer.h"
namespace { namespace {
@ -32,28 +30,14 @@ constexpr auto kAutoLockTimeoutLateMs = TimeMs(3000);
} // namespace } // namespace
AuthSessionData::AuthSessionData() { AuthSessionSettings::Variables::Variables()
Notify::PeerUpdateViewer(
Notify::PeerUpdate::Flag::UserIsContact
) | rpl::map([](const Notify::PeerUpdate &update) {
return update.peer->asUser();
}) | rpl::filter([](UserData *user) {
return user != nullptr;
}) | rpl::start_with_next([=](not_null<UserData*> user) {
userIsContactUpdated(user);
}, _lifetime);
}
AuthSessionData::~AuthSessionData() = default;
AuthSessionData::Variables::Variables()
: sendFilesWay(SendFilesWay::Album) : sendFilesWay(SendFilesWay::Album)
, selectorTab(ChatHelpers::SelectorTab::Emoji) , selectorTab(ChatHelpers::SelectorTab::Emoji)
, floatPlayerColumn(Window::Column::Second) , floatPlayerColumn(Window::Column::Second)
, floatPlayerCorner(RectPart::TopRight) { , floatPlayerCorner(RectPart::TopRight) {
} }
QByteArray AuthSessionData::serialize() const { QByteArray AuthSessionSettings::serialize() const {
auto size = sizeof(qint32) * 10; auto size = sizeof(qint32) * 10;
for (auto i = _variables.soundOverrides.cbegin(), e = _variables.soundOverrides.cend(); i != e; ++i) { for (auto i = _variables.soundOverrides.cbegin(), e = _variables.soundOverrides.cend(); i != e; ++i) {
size += Serialize::stringSize(i.key()) + Serialize::stringSize(i.value()); size += Serialize::stringSize(i.key()) + Serialize::stringSize(i.value());
@ -92,7 +76,7 @@ QByteArray AuthSessionData::serialize() const {
return result; return result;
} }
void AuthSessionData::constructFromSerialized(const QByteArray &serialized) { void AuthSessionSettings::constructFromSerialized(const QByteArray &serialized) {
if (serialized.isEmpty()) { if (serialized.isEmpty()) {
return; return;
} }
@ -162,7 +146,8 @@ void AuthSessionData::constructFromSerialized(const QByteArray &serialized) {
thirdSectionExtendedBy = value; thirdSectionExtendedBy = value;
} }
if (stream.status() != QDataStream::Ok) { if (stream.status() != QDataStream::Ok) {
LOG(("App Error: Bad data for AuthSessionData::constructFromSerialized()")); LOG(("App Error: "
"Bad data for AuthSessionSettings::constructFromSerialized()"));
return; return;
} }
@ -206,87 +191,7 @@ void AuthSessionData::constructFromSerialized(const QByteArray &serialized) {
} }
} }
void AuthSessionData::markItemLayoutChanged(not_null<const HistoryItem*> item) { void AuthSessionSettings::setTabbedSelectorSectionEnabled(bool enabled) {
_itemLayoutChanged.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> AuthSessionData::itemLayoutChanged() const {
return _itemLayoutChanged.events();
}
void AuthSessionData::requestItemRepaint(not_null<const HistoryItem*> item) {
_itemRepaintRequest.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> AuthSessionData::itemRepaintRequest() const {
return _itemRepaintRequest.events();
}
void AuthSessionData::markItemRemoved(not_null<const HistoryItem*> item) {
_itemRemoved.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> AuthSessionData::itemRemoved() const {
return _itemRemoved.events();
}
void AuthSessionData::markHistoryUnloaded(not_null<const History*> history) {
_historyUnloaded.fire_copy(history);
}
rpl::producer<not_null<const History*>> AuthSessionData::historyUnloaded() const {
return _historyUnloaded.events();
}
void AuthSessionData::markHistoryCleared(not_null<const History*> history) {
_historyCleared.fire_copy(history);
}
rpl::producer<not_null<const History*>> AuthSessionData::historyCleared() const {
return _historyCleared.events();
}
void AuthSessionData::removeMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user) {
_megagroupParticipantRemoved.fire({ channel, user });
}
auto AuthSessionData::megagroupParticipantRemoved() const -> rpl::producer<MegagroupParticipant> {
return _megagroupParticipantRemoved.events();
}
rpl::producer<not_null<UserData*>> AuthSessionData::megagroupParticipantRemoved(
not_null<ChannelData*> channel) const {
return megagroupParticipantRemoved(
) | rpl::filter([channel](auto updateChannel, auto user) {
return (updateChannel == channel);
}) | rpl::map([](auto updateChannel, auto user) {
return user;
});
}
void AuthSessionData::addNewMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user) {
_megagroupParticipantAdded.fire({ channel, user });
}
auto AuthSessionData::megagroupParticipantAdded() const -> rpl::producer<MegagroupParticipant> {
return _megagroupParticipantAdded.events();
}
rpl::producer<not_null<UserData*>> AuthSessionData::megagroupParticipantAdded(
not_null<ChannelData*> channel) const {
return megagroupParticipantAdded(
) | rpl::filter([channel](auto updateChannel, auto user) {
return (updateChannel == channel);
}) | rpl::map([](auto updateChannel, auto user) {
return user;
});
}
void AuthSessionData::setTabbedSelectorSectionEnabled(bool enabled) {
_variables.tabbedSelectorSectionEnabled = enabled; _variables.tabbedSelectorSectionEnabled = enabled;
if (enabled) { if (enabled) {
setThirdSectionInfoEnabled(false); setThirdSectionInfoEnabled(false);
@ -294,12 +199,12 @@ void AuthSessionData::setTabbedSelectorSectionEnabled(bool enabled) {
setTabbedReplacedWithInfo(false); setTabbedReplacedWithInfo(false);
} }
rpl::producer<bool> AuthSessionData::tabbedReplacedWithInfoValue() const { rpl::producer<bool> AuthSessionSettings::tabbedReplacedWithInfoValue() const {
return _tabbedReplacedWithInfoValue.events_starting_with( return _tabbedReplacedWithInfoValue.events_starting_with(
tabbedReplacedWithInfo()); tabbedReplacedWithInfo());
} }
void AuthSessionData::setThirdSectionInfoEnabled(bool enabled) { void AuthSessionSettings::setThirdSectionInfoEnabled(bool enabled) {
if (_variables.thirdSectionInfoEnabled != enabled) { if (_variables.thirdSectionInfoEnabled != enabled) {
_variables.thirdSectionInfoEnabled = enabled; _variables.thirdSectionInfoEnabled = enabled;
if (enabled) { if (enabled) {
@ -310,19 +215,19 @@ void AuthSessionData::setThirdSectionInfoEnabled(bool enabled) {
} }
} }
rpl::producer<bool> AuthSessionData::thirdSectionInfoEnabledValue() const { rpl::producer<bool> AuthSessionSettings::thirdSectionInfoEnabledValue() const {
return _thirdSectionInfoEnabledValue.events_starting_with( return _thirdSectionInfoEnabledValue.events_starting_with(
thirdSectionInfoEnabled()); thirdSectionInfoEnabled());
} }
void AuthSessionData::setTabbedReplacedWithInfo(bool enabled) { void AuthSessionSettings::setTabbedReplacedWithInfo(bool enabled) {
if (_tabbedReplacedWithInfo != enabled) { if (_tabbedReplacedWithInfo != enabled) {
_tabbedReplacedWithInfo = enabled; _tabbedReplacedWithInfo = enabled;
_tabbedReplacedWithInfoValue.fire_copy(enabled); _tabbedReplacedWithInfoValue.fire_copy(enabled);
} }
} }
QString AuthSessionData::getSoundPath(const QString &key) const { QString AuthSessionSettings::getSoundPath(const QString &key) const {
auto it = _variables.soundOverrides.constFind(key); auto it = _variables.soundOverrides.constFind(key);
if (it != _variables.soundOverrides.end()) { if (it != _variables.soundOverrides.end()) {
return it.value(); return it.value();
@ -330,100 +235,30 @@ QString AuthSessionData::getSoundPath(const QString &key) const {
return qsl(":/sounds/") + key + qsl(".mp3"); return qsl(":/sounds/") + key + qsl(".mp3");
} }
void AuthSessionData::setDialogsWidthRatio(float64 ratio) { void AuthSessionSettings::setDialogsWidthRatio(float64 ratio) {
_variables.dialogsWidthRatio = ratio; _variables.dialogsWidthRatio = ratio;
} }
float64 AuthSessionData::dialogsWidthRatio() const { float64 AuthSessionSettings::dialogsWidthRatio() const {
return _variables.dialogsWidthRatio.current(); return _variables.dialogsWidthRatio.current();
} }
rpl::producer<float64> AuthSessionData::dialogsWidthRatioChanges() const { rpl::producer<float64> AuthSessionSettings::dialogsWidthRatioChanges() const {
return _variables.dialogsWidthRatio.changes(); return _variables.dialogsWidthRatio.changes();
} }
void AuthSessionData::setThirdColumnWidth(int width) { void AuthSessionSettings::setThirdColumnWidth(int width) {
_variables.thirdColumnWidth = width; _variables.thirdColumnWidth = width;
} }
int AuthSessionData::thirdColumnWidth() const { int AuthSessionSettings::thirdColumnWidth() const {
return _variables.thirdColumnWidth.current(); return _variables.thirdColumnWidth.current();
} }
rpl::producer<int> AuthSessionData::thirdColumnWidthChanges() const { rpl::producer<int> AuthSessionSettings::thirdColumnWidthChanges() const {
return _variables.thirdColumnWidth.changes(); return _variables.thirdColumnWidth.changes();
} }
void AuthSessionData::markStickersUpdated() {
_stickersUpdated.fire({});
}
rpl::producer<> AuthSessionData::stickersUpdated() const {
return _stickersUpdated.events();
}
void AuthSessionData::markSavedGifsUpdated() {
_savedGifsUpdated.fire({});
}
rpl::producer<> AuthSessionData::savedGifsUpdated() const {
return _savedGifsUpdated.events();
}
void AuthSessionData::userIsContactUpdated(not_null<UserData*> user) {
const auto &items = App::sharedContactItems();
const auto i = items.constFind(peerToUser(user->id));
if (i != items.cend()) {
for (const auto item : std::as_const(i.value())) {
item->setPendingInitDimensions();
}
}
}
HistoryItemsList AuthSessionData::idsToItems(
const MessageIdsList &ids) const {
return ranges::view::all(
ids
) | ranges::view::transform([](const FullMsgId &fullId) {
return App::histItemById(fullId);
}) | ranges::view::filter([](HistoryItem *item) {
return item != nullptr;
}) | ranges::view::transform([](HistoryItem *item) {
return not_null<HistoryItem*>(item);
}) | ranges::to_vector;
}
MessageIdsList AuthSessionData::itemsToIds(
const HistoryItemsList &items) const {
return ranges::view::all(
items
) | ranges::view::transform([](not_null<HistoryItem*> item) {
return item->fullId();
}) | ranges::to_vector;
}
MessageIdsList AuthSessionData::groupToIds(
not_null<HistoryMessageGroup*> group) const {
auto result = itemsToIds(group->others);
result.push_back(group->leader->fullId());
return result;
}
not_null<Data::Feed*> AuthSessionData::feed(FeedId id) {
if (const auto result = feedLoaded(id)) {
return result;
}
const auto [it, ok] = _feeds.emplace(
id,
std::make_unique<Data::Feed>(id));
return it->second.get();
}
Data::Feed *AuthSessionData::feedLoaded(FeedId id) {
const auto it = _feeds.find(id);
return (it == _feeds.end()) ? nullptr : it->second.get();
}
AuthSession &Auth() { AuthSession &Auth() {
auto result = Messenger::Instance().authSession(); auto result = Messenger::Instance().authSession();
Assert(result != nullptr); Assert(result != nullptr);
@ -433,6 +268,7 @@ AuthSession &Auth() {
AuthSession::AuthSession(UserId userId) AuthSession::AuthSession(UserId userId)
: _userId(userId) : _userId(userId)
, _autoLockTimer([this] { checkAutoLock(); }) , _autoLockTimer([this] { checkAutoLock(); })
, _data(std::make_unique<Data::Session>())
, _api(std::make_unique<ApiWrap>(this)) , _api(std::make_unique<ApiWrap>(this))
, _calls(std::make_unique<Calls::Instance>()) , _calls(std::make_unique<Calls::Instance>())
, _downloader(std::make_unique<Storage::Downloader>()) , _downloader(std::make_unique<Storage::Downloader>())
@ -476,7 +312,7 @@ bool AuthSession::validateSelf(const MTPUser &user) {
return true; return true;
} }
void AuthSession::saveDataDelayed(TimeMs delay) { void AuthSession::saveSettingsDelayed(TimeMs delay) {
Expects(this == &Auth()); Expects(this == &Auth());
_saveDataTimer.callOnce(delay); _saveDataTimer.callOnce(delay);
} }
@ -488,7 +324,7 @@ void AuthSession::checkAutoLock() {
auto now = getms(true); auto now = getms(true);
auto shouldLockInMs = Global::AutoLock() * 1000LL; auto shouldLockInMs = Global::AutoLock() * 1000LL;
auto idleForMs = psIdleTime(); auto idleForMs = psIdleTime();
auto notPlayingVideoForMs = now - data().lastTimeVideoPlayedAt(); auto notPlayingVideoForMs = now - settings().lastTimeVideoPlayedAt();
auto checkTimeMs = qMin(idleForMs, notPlayingVideoForMs); auto checkTimeMs = qMin(idleForMs, notPlayingVideoForMs);
if (checkTimeMs >= shouldLockInMs || (_shouldLockAt > 0 && now > _shouldLockAt + kAutoLockTimeoutLateMs)) { if (checkTimeMs >= shouldLockInMs || (_shouldLockAt > 0 && now > _shouldLockAt + kAutoLockTimeoutLateMs)) {
Messenger::Instance().setupPasscode(); Messenger::Instance().setupPasscode();

191
Telegram/SourceFiles/auth_session.h
View File

@ -11,13 +11,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <rpl/filter.h> #include <rpl/filter.h>
#include <rpl/variable.h> #include <rpl/variable.h>
#include "base/timer.h" #include "base/timer.h"
#include "chat_helpers/stickers.h"
class ApiWrap; class ApiWrap;
enum class SendFilesWay; enum class SendFilesWay;
namespace Data { namespace Data {
class Feed; class Session;
} // namespace Data } // namespace Data
namespace Storage { namespace Storage {
@ -45,68 +44,20 @@ namespace Core {
class Changelogs; class Changelogs;
} // namespace Core } // namespace Core
class AuthSessionData final { class AuthSessionSettings final {
public: public:
AuthSessionData(); void moveFrom(AuthSessionSettings &&other) {
~AuthSessionData();
base::Variable<bool> &contactsLoaded() {
return _contactsLoaded;
}
base::Variable<bool> &allChatsLoaded() {
return _allChatsLoaded;
}
base::Observable<void> &moreChatsLoaded() {
return _moreChatsLoaded;
}
base::Observable<void> &pendingHistoryResize() {
return _pendingHistoryResize;
}
struct ItemVisibilityQuery {
not_null<HistoryItem*> item;
not_null<bool*> isVisible;
};
base::Observable<ItemVisibilityQuery> &queryItemVisibility() {
return _queryItemVisibility;
}
void markItemLayoutChanged(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemLayoutChanged() const;
void requestItemRepaint(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemRepaintRequest() const;
void markItemRemoved(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemRemoved() const;
void markHistoryUnloaded(not_null<const History*> history);
rpl::producer<not_null<const History*>> historyUnloaded() const;
void markHistoryCleared(not_null<const History*> history);
rpl::producer<not_null<const History*>> historyCleared() const;
using MegagroupParticipant = std::tuple<
not_null<ChannelData*>,
not_null<UserData*>>;
void removeMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user);
rpl::producer<MegagroupParticipant> megagroupParticipantRemoved() const;
rpl::producer<not_null<UserData*>> megagroupParticipantRemoved(
not_null<ChannelData*> channel) const;
void addNewMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user);
rpl::producer<MegagroupParticipant> megagroupParticipantAdded() const;
rpl::producer<not_null<UserData*>> megagroupParticipantAdded(
not_null<ChannelData*> channel) const;
void moveFrom(AuthSessionData &&other) {
_variables = std::move(other._variables); _variables = std::move(other._variables);
} }
QByteArray serialize() const; QByteArray serialize() const;
void constructFromSerialized(const QByteArray &serialized); void constructFromSerialized(const QByteArray &serialized);
bool lastSeenWarningSeen() const {
return _variables.lastSeenWarningSeen;
}
void setLastSeenWarningSeen(bool lastSeenWarningSeen) { void setLastSeenWarningSeen(bool lastSeenWarningSeen) {
_variables.lastSeenWarningSeen = lastSeenWarningSeen; _variables.lastSeenWarningSeen = lastSeenWarningSeen;
} }
bool lastSeenWarningSeen() const {
return _variables.lastSeenWarningSeen;
}
void setSendFilesWay(SendFilesWay way) { void setSendFilesWay(SendFilesWay way) {
_variables.sendFilesWay = way; _variables.sendFilesWay = way;
} }
@ -183,10 +134,6 @@ public:
int thirdColumnWidth() const; int thirdColumnWidth() const;
rpl::producer<int> thirdColumnWidthChanges() const; rpl::producer<int> thirdColumnWidthChanges() const;
void markStickersUpdated();
rpl::producer<> stickersUpdated() const;
void markSavedGifsUpdated();
rpl::producer<> savedGifsUpdated() const;
void setGroupStickersSectionHidden(PeerId peerId) { void setGroupStickersSectionHidden(PeerId peerId) {
_variables.groupStickersSectionHidden.insert(peerId); _variables.groupStickersSectionHidden.insert(peerId);
} }
@ -196,82 +143,6 @@ public:
void removeGroupStickersSectionHidden(PeerId peerId) { void removeGroupStickersSectionHidden(PeerId peerId) {
_variables.groupStickersSectionHidden.remove(peerId); _variables.groupStickersSectionHidden.remove(peerId);
} }
bool stickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastStickersUpdate, now);
}
void setLastStickersUpdate(TimeMs update) {
_lastStickersUpdate = update;
}
bool recentStickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastRecentStickersUpdate, now);
}
void setLastRecentStickersUpdate(TimeMs update) {
_lastRecentStickersUpdate = update;
}
bool favedStickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastFavedStickersUpdate, now);
}
void setLastFavedStickersUpdate(TimeMs update) {
_lastFavedStickersUpdate = update;
}
bool featuredStickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastFeaturedStickersUpdate, now);
}
void setLastFeaturedStickersUpdate(TimeMs update) {
_lastFeaturedStickersUpdate = update;
}
bool savedGifsUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastSavedGifsUpdate, now);
}
void setLastSavedGifsUpdate(TimeMs update) {
_lastSavedGifsUpdate = update;
}
int featuredStickerSetsUnreadCount() const {
return _featuredStickerSetsUnreadCount.current();
}
void setFeaturedStickerSetsUnreadCount(int count) {
_featuredStickerSetsUnreadCount = count;
}
rpl::producer<int> featuredStickerSetsUnreadCountValue() const {
return _featuredStickerSetsUnreadCount.value();
}
const Stickers::Sets &stickerSets() const {
return _stickerSets;
}
Stickers::Sets &stickerSetsRef() {
return _stickerSets;
}
const Stickers::Order &stickerSetsOrder() const {
return _stickerSetsOrder;
}
Stickers::Order &stickerSetsOrderRef() {
return _stickerSetsOrder;
}
const Stickers::Order &featuredStickerSetsOrder() const {
return _featuredStickerSetsOrder;
}
Stickers::Order &featuredStickerSetsOrderRef() {
return _featuredStickerSetsOrder;
}
const Stickers::Order &archivedStickerSetsOrder() const {
return _archivedStickerSetsOrder;
}
Stickers::Order &archivedStickerSetsOrderRef() {
return _archivedStickerSetsOrder;
}
const Stickers::SavedGifs &savedGifs() const {
return _savedGifs;
}
Stickers::SavedGifs &savedGifsRef() {
return _savedGifs;
}
HistoryItemsList idsToItems(const MessageIdsList &ids) const;
MessageIdsList itemsToIds(const HistoryItemsList &items) const;
MessageIdsList groupToIds(not_null<HistoryMessageGroup*> group) const;
not_null<Data::Feed*> feed(FeedId id);
Data::Feed *feedLoaded(FeedId id);
private: private:
struct Variables { struct Variables {
@ -298,42 +169,6 @@ private:
= kDefaultThirdColumnWidth; // per-window = kDefaultThirdColumnWidth; // per-window
}; };
bool stickersUpdateNeeded(TimeMs lastUpdate, TimeMs now) const {
constexpr auto kStickersUpdateTimeout = TimeMs(3600'000);
return (lastUpdate == 0)
|| (now >= lastUpdate + kStickersUpdateTimeout);
}
void userIsContactUpdated(not_null<UserData*> user);
base::Variable<bool> _contactsLoaded = { false };
base::Variable<bool> _allChatsLoaded = { false };
base::Observable<void> _moreChatsLoaded;
base::Observable<void> _pendingHistoryResize;
base::Observable<ItemVisibilityQuery> _queryItemVisibility;
rpl::event_stream<not_null<const HistoryItem*>> _itemLayoutChanged;
rpl::event_stream<not_null<const HistoryItem*>> _itemRepaintRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemRemoved;
rpl::event_stream<not_null<const History*>> _historyUnloaded;
rpl::event_stream<not_null<const History*>> _historyCleared;
rpl::event_stream<MegagroupParticipant> _megagroupParticipantRemoved;
rpl::event_stream<MegagroupParticipant> _megagroupParticipantAdded;
rpl::event_stream<> _stickersUpdated;
rpl::event_stream<> _savedGifsUpdated;
TimeMs _lastStickersUpdate = 0;
TimeMs _lastRecentStickersUpdate = 0;
TimeMs _lastFavedStickersUpdate = 0;
TimeMs _lastFeaturedStickersUpdate = 0;
TimeMs _lastSavedGifsUpdate = 0;
rpl::variable<int> _featuredStickerSetsUnreadCount = 0;
Stickers::Sets _stickerSets;
Stickers::Order _stickerSetsOrder;
Stickers::Order _featuredStickerSetsOrder;
Stickers::Order _archivedStickerSetsOrder;
Stickers::SavedGifs _savedGifs;
base::flat_map<FeedId, std::unique_ptr<Data::Feed>> _feeds;
rpl::event_stream<bool> _thirdSectionInfoEnabledValue; rpl::event_stream<bool> _thirdSectionInfoEnabledValue;
bool _tabbedReplacedWithInfo = false; bool _tabbedReplacedWithInfo = false;
rpl::event_stream<bool> _tabbedReplacedWithInfoValue; rpl::event_stream<bool> _tabbedReplacedWithInfoValue;
@ -341,8 +176,6 @@ private:
Variables _variables; Variables _variables;
TimeMs _lastTimeVideoPlayedAt = 0; TimeMs _lastTimeVideoPlayedAt = 0;
rpl::lifetime _lifetime;
}; };
// One per Messenger. // One per Messenger.
@ -383,10 +216,13 @@ public:
return *_notifications; return *_notifications;
} }
AuthSessionData &data() { Data::Session &data() {
return _data; return *_data;
} }
void saveDataDelayed(TimeMs delay = kDefaultSaveDelay); AuthSessionSettings &settings() {
return _settings;
}
void saveSettingsDelayed(TimeMs delay = kDefaultSaveDelay);
ApiWrap &api() { ApiWrap &api() {
return *_api; return *_api;
@ -408,12 +244,13 @@ private:
static constexpr auto kDefaultSaveDelay = TimeMs(1000); static constexpr auto kDefaultSaveDelay = TimeMs(1000);
const UserId _userId = 0; const UserId _userId = 0;
AuthSessionData _data; AuthSessionSettings _settings;
base::Timer _saveDataTimer; base::Timer _saveDataTimer;
TimeMs _shouldLockAt = 0; TimeMs _shouldLockAt = 0;
base::Timer _autoLockTimer; base::Timer _autoLockTimer;
const std::unique_ptr<Data::Session> _data;
const std::unique_ptr<ApiWrap> _api; const std::unique_ptr<ApiWrap> _api;
const std::unique_ptr<Calls::Instance> _calls; const std::unique_ptr<Calls::Instance> _calls;
const std::unique_ptr<Storage::Downloader> _downloader; const std::unique_ptr<Storage::Downloader> _downloader;

1
Telegram/SourceFiles/boxes/peer_list_controllers.cpp
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "observer_peer.h" #include "observer_peer.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "auth_session.h" #include "auth_session.h"
#include "data/data_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"

8
Telegram/SourceFiles/boxes/send_files_box.cpp
View File

@ -1433,7 +1433,7 @@ void SendFilesBox::initSendWay() {
? SendFilesWay::Album ? SendFilesWay::Album
: SendFilesWay::Photos; : SendFilesWay::Photos;
} }
const auto currentWay = Auth().data().sendFilesWay(); const auto currentWay = Auth().settings().sendFilesWay();
if (currentWay == SendFilesWay::Files) { if (currentWay == SendFilesWay::Files) {
return currentWay; return currentWay;
} else if (currentWay == SendFilesWay::Album) { } else if (currentWay == SendFilesWay::Album) {
@ -1756,7 +1756,7 @@ void SendFilesBox::send(bool ctrlShiftEnter) {
const auto way = _sendWay ? _sendWay->value() : Way::Files; const auto way = _sendWay ? _sendWay->value() : Way::Files;
if (_compressConfirm == CompressConfirm::Auto) { if (_compressConfirm == CompressConfirm::Auto) {
const auto oldWay = Auth().data().sendFilesWay(); const auto oldWay = Auth().settings().sendFilesWay();
if (way != oldWay) { if (way != oldWay) {
// Check if the user _could_ use the old value, but didn't. // Check if the user _could_ use the old value, but didn't.
if ((oldWay == Way::Album && _sendAlbum) if ((oldWay == Way::Album && _sendAlbum)
@ -1764,8 +1764,8 @@ void SendFilesBox::send(bool ctrlShiftEnter) {
|| (oldWay == Way::Files && _sendFiles) || (oldWay == Way::Files && _sendFiles)
|| (way == Way::Files && (_sendAlbum || _sendPhotos))) { || (way == Way::Files && (_sendAlbum || _sendPhotos))) {
// And in that case save it to settings. // And in that case save it to settings.
Auth().data().setSendFilesWay(way); Auth().settings().setSendFilesWay(way);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
} }
} }
} }

1
Telegram/SourceFiles/boxes/sticker_set_box.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/sticker_set_box.h" #include "boxes/sticker_set_box.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "mainwindow.h" #include "mainwindow.h"

1
Telegram/SourceFiles/boxes/stickers_box.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "stickers_box.h" #include "stickers_box.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "chat_helpers/stickers.h" #include "chat_helpers/stickers.h"

1
Telegram/SourceFiles/calls/calls_box_controller.cpp
View File

@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_media_types.h" #include "history/history_media_types.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "auth_session.h"
#include "data/data_session.h"
namespace Calls { namespace Calls {
namespace { namespace {

5
Telegram/SourceFiles/calls/calls_call.cpp
View File

@ -248,7 +248,10 @@ QString Call::getDebugLog() const {
void Call::startWaitingTrack() { void Call::startWaitingTrack() {
_waitingTrack = Media::Audio::Current().createTrack(); _waitingTrack = Media::Audio::Current().createTrack();
auto trackFileName = Auth().data().getSoundPath((_type == Type::Outgoing) ? qsl("call_outgoing") : qsl("call_incoming")); auto trackFileName = Auth().settings().getSoundPath(
(_type == Type::Outgoing)
? qsl("call_outgoing")
: qsl("call_incoming"));
_waitingTrack->samplePeakEach(kSoundSampleMs); _waitingTrack->samplePeakEach(kSoundSampleMs);
_waitingTrack->fillFromFile(trackFileName); _waitingTrack->fillFromFile(trackFileName);
_waitingTrack->playInLoop(); _waitingTrack->playInLoop();

9
Telegram/SourceFiles/calls/calls_instance.cpp
View File

@ -60,7 +60,8 @@ void Instance::playSound(Sound sound) {
case Sound::Busy: { case Sound::Busy: {
if (!_callBusyTrack) { if (!_callBusyTrack) {
_callBusyTrack = Media::Audio::Current().createTrack(); _callBusyTrack = Media::Audio::Current().createTrack();
_callBusyTrack->fillFromFile(Auth().data().getSoundPath(qsl("call_busy"))); _callBusyTrack->fillFromFile(
Auth().settings().getSoundPath(qsl("call_busy")));
} }
_callBusyTrack->playOnce(); _callBusyTrack->playOnce();
} break; } break;
@ -68,7 +69,8 @@ void Instance::playSound(Sound sound) {
case Sound::Ended: { case Sound::Ended: {
if (!_callEndedTrack) { if (!_callEndedTrack) {
_callEndedTrack = Media::Audio::Current().createTrack(); _callEndedTrack = Media::Audio::Current().createTrack();
_callEndedTrack->fillFromFile(Auth().data().getSoundPath(qsl("call_end"))); _callEndedTrack->fillFromFile(
Auth().settings().getSoundPath(qsl("call_end")));
} }
_callEndedTrack->playOnce(); _callEndedTrack->playOnce();
} break; } break;
@ -76,7 +78,8 @@ void Instance::playSound(Sound sound) {
case Sound::Connecting: { case Sound::Connecting: {
if (!_callConnectingTrack) { if (!_callConnectingTrack) {
_callConnectingTrack = Media::Audio::Current().createTrack(); _callConnectingTrack = Media::Audio::Current().createTrack();
_callConnectingTrack->fillFromFile(Auth().data().getSoundPath(qsl("call_connect"))); _callConnectingTrack->fillFromFile(
Auth().settings().getSoundPath(qsl("call_connect")));
} }
_callConnectingTrack->playOnce(); _callConnectingTrack->playOnce();
} break; } break;

1
Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_photo.h" #include "data/data_photo.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "styles/style_chat_helpers.h" #include "styles/style_chat_helpers.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"

1
Telegram/SourceFiles/chat_helpers/stickers.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "stickers.h" #include "stickers.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "boxes/stickers_box.h" #include "boxes/stickers_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"

9
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "chat_helpers/stickers_list_widget.h" #include "chat_helpers/stickers_list_widget.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "boxes/stickers_box.h" #include "boxes/stickers_box.h"
@ -1393,17 +1394,17 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
}; };
if (_megagroupSet->mgInfo->stickerSet.type() == mtpc_inputStickerSetEmpty) { if (_megagroupSet->mgInfo->stickerSet.type() == mtpc_inputStickerSetEmpty) {
if (canEdit) { if (canEdit) {
auto hidden = Auth().data().isGroupStickersSectionHidden(_megagroupSet->id); auto hidden = Auth().settings().isGroupStickersSectionHidden(_megagroupSet->id);
if (isShownHere(hidden)) { if (isShownHere(hidden)) {
_mySets.push_back(Set(Stickers::MegagroupSetId, MTPDstickerSet_ClientFlag::f_special | 0, lang(lng_group_stickers), 0)); _mySets.push_back(Set(Stickers::MegagroupSetId, MTPDstickerSet_ClientFlag::f_special | 0, lang(lng_group_stickers), 0));
} }
} }
return; return;
} }
auto hidden = Auth().data().isGroupStickersSectionHidden(_megagroupSet->id); auto hidden = Auth().settings().isGroupStickersSectionHidden(_megagroupSet->id);
auto removeHiddenForGroup = [this, &hidden] { auto removeHiddenForGroup = [this, &hidden] {
if (hidden) { if (hidden) {
Auth().data().removeGroupStickersSectionHidden(_megagroupSet->id); Auth().settings().removeGroupStickersSectionHidden(_megagroupSet->id);
Local::writeUserSettings(); Local::writeUserSettings();
hidden = false; hidden = false;
} }
@ -1753,7 +1754,7 @@ void StickersListWidget::installSet(uint64 setId) {
void StickersListWidget::removeMegagroupSet(bool locally) { void StickersListWidget::removeMegagroupSet(bool locally) {
if (locally) { if (locally) {
Auth().data().setGroupStickersSectionHidden(_megagroupSet->id); Auth().settings().setGroupStickersSectionHidden(_megagroupSet->id);
Local::writeUserSettings(); Local::writeUserSettings();
refreshStickers(); refreshStickers();
return; return;

1
Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once #pragma once
#include "chat_helpers/tabbed_selector.h" #include "chat_helpers/tabbed_selector.h"
#include "chat_helpers/stickers.h"
#include "base/variant.h" #include "base/variant.h"
namespace Window { namespace Window {

6
Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
View File

@ -277,7 +277,7 @@ TabbedSelector::TabbedSelector(QWidget *parent, not_null<Window::Controller*> co
Tab { SelectorTab::Stickers, object_ptr<StickersListWidget>(this, controller) }, Tab { SelectorTab::Stickers, object_ptr<StickersListWidget>(this, controller) },
Tab { SelectorTab::Gifs, object_ptr<GifsListWidget>(this, controller) }, Tab { SelectorTab::Gifs, object_ptr<GifsListWidget>(this, controller) },
} } } }
, _currentTabType(Auth().data().selectorTab()) { , _currentTabType(Auth().settings().selectorTab()) {
resize(st::emojiPanWidth, st::emojiPanMaxHeight); resize(st::emojiPanWidth, st::emojiPanMaxHeight);
for (auto &tab : _tabs) { for (auto &tab : _tabs) {
@ -685,8 +685,8 @@ void TabbedSelector::switchTab() {
_a_slide.start([this] { update(); }, 0., 1., st::emojiPanSlideDuration, anim::linear); _a_slide.start([this] { update(); }, 0., 1., st::emojiPanSlideDuration, anim::linear);
update(); update();
Auth().data().setSelectorTab(_currentTabType); Auth().settings().setSelectorTab(_currentTabType);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
} }
not_null<EmojiListWidget*> TabbedSelector::emoji() const { not_null<EmojiListWidget*> TabbedSelector::emoji() const {

1
Telegram/SourceFiles/core/changelogs.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "data/data_session.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "apiwrap.h" #include "apiwrap.h"

1
Telegram/SourceFiles/data/data_document.cpp
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "inline_bots/inline_bot_layout_item.h" #include "inline_bots/inline_bot_layout_item.h"
#include "mainwidget.h" #include "mainwidget.h"

1
Telegram/SourceFiles/data/data_peer.cpp
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_channel_admins.h" #include "data/data_channel_admins.h"
#include "data/data_photo.h" #include "data/data_photo.h"
#include "data/data_feed.h" #include "data/data_feed.h"
#include "data/data_session.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "mainwidget.h" #include "mainwidget.h"

1
Telegram/SourceFiles/data/data_photo.cpp
View File

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "data/data_photo.h" #include "data/data_photo.h"
#include "data/data_session.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "history/history_media_types.h" #include "history/history_media_types.h"
#include "auth_session.h" #include "auth_session.h"

1
Telegram/SourceFiles/data/data_search_controller.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_search_controller.h" #include "data/data_search_controller.h"
#include "auth_session.h" #include "auth_session.h"
#include "data/data_session.h"
namespace Api { namespace Api {
namespace { namespace {

182
Telegram/SourceFiles/data/data_session.cpp Normal file
View File

@ -0,0 +1,182 @@
/*
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "data/data_session.h"
#include "observer_peer.h"
#include "history/history_item_components.h"
#include "data/data_feed.h"
namespace Data {
Session::Session() {
Notify::PeerUpdateViewer(
Notify::PeerUpdate::Flag::UserIsContact
) | rpl::map([](const Notify::PeerUpdate &update) {
return update.peer->asUser();
}) | rpl::filter([](UserData *user) {
return user != nullptr;
}) | rpl::start_with_next([=](not_null<UserData*> user) {
userIsContactUpdated(user);
}, _lifetime);
}
Session::~Session() = default;
void Session::markItemLayoutChanged(not_null<const HistoryItem*> item) {
_itemLayoutChanged.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> Session::itemLayoutChanged() const {
return _itemLayoutChanged.events();
}
void Session::requestItemRepaint(not_null<const HistoryItem*> item) {
_itemRepaintRequest.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> Session::itemRepaintRequest() const {
return _itemRepaintRequest.events();
}
void Session::markItemRemoved(not_null<const HistoryItem*> item) {
_itemRemoved.fire_copy(item);
}
rpl::producer<not_null<const HistoryItem*>> Session::itemRemoved() const {
return _itemRemoved.events();
}
void Session::markHistoryUnloaded(not_null<const History*> history) {
_historyUnloaded.fire_copy(history);
}
rpl::producer<not_null<const History*>> Session::historyUnloaded() const {
return _historyUnloaded.events();
}
void Session::markHistoryCleared(not_null<const History*> history) {
_historyCleared.fire_copy(history);
}
rpl::producer<not_null<const History*>> Session::historyCleared() const {
return _historyCleared.events();
}
void Session::removeMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user) {
_megagroupParticipantRemoved.fire({ channel, user });
}
auto Session::megagroupParticipantRemoved() const
-> rpl::producer<MegagroupParticipant> {
return _megagroupParticipantRemoved.events();
}
rpl::producer<not_null<UserData*>> Session::megagroupParticipantRemoved(
not_null<ChannelData*> channel) const {
return megagroupParticipantRemoved(
) | rpl::filter([channel](auto updateChannel, auto user) {
return (updateChannel == channel);
}) | rpl::map([](auto updateChannel, auto user) {
return user;
});
}
void Session::addNewMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user) {
_megagroupParticipantAdded.fire({ channel, user });
}
auto Session::megagroupParticipantAdded() const
-> rpl::producer<MegagroupParticipant> {
return _megagroupParticipantAdded.events();
}
rpl::producer<not_null<UserData*>> Session::megagroupParticipantAdded(
not_null<ChannelData*> channel) const {
return megagroupParticipantAdded(
) | rpl::filter([channel](auto updateChannel, auto user) {
return (updateChannel == channel);
}) | rpl::map([](auto updateChannel, auto user) {
return user;
});
}
void Session::markStickersUpdated() {
_stickersUpdated.fire({});
}
rpl::producer<> Session::stickersUpdated() const {
return _stickersUpdated.events();
}
void Session::markSavedGifsUpdated() {
_savedGifsUpdated.fire({});
}
rpl::producer<> Session::savedGifsUpdated() const {
return _savedGifsUpdated.events();
}
void Session::userIsContactUpdated(not_null<UserData*> user) {
const auto &items = App::sharedContactItems();
const auto i = items.constFind(peerToUser(user->id));
if (i != items.cend()) {
for (const auto item : std::as_const(i.value())) {
item->setPendingInitDimensions();
}
}
}
HistoryItemsList Session::idsToItems(
const MessageIdsList &ids) const {
return ranges::view::all(
ids
) | ranges::view::transform([](const FullMsgId &fullId) {
return App::histItemById(fullId);
}) | ranges::view::filter([](HistoryItem *item) {
return item != nullptr;
}) | ranges::view::transform([](HistoryItem *item) {
return not_null<HistoryItem*>(item);
}) | ranges::to_vector;
}
MessageIdsList Session::itemsToIds(
const HistoryItemsList &items) const {
return ranges::view::all(
items
) | ranges::view::transform([](not_null<HistoryItem*> item) {
return item->fullId();
}) | ranges::to_vector;
}
MessageIdsList Session::groupToIds(
not_null<HistoryMessageGroup*> group) const {
auto result = itemsToIds(group->others);
result.push_back(group->leader->fullId());
return result;
}
not_null<Data::Feed*> Session::feed(FeedId id) {
if (const auto result = feedLoaded(id)) {
return result;
}
const auto [it, ok] = _feeds.emplace(
id,
std::make_unique<Data::Feed>(id));
return it->second.get();
}
Data::Feed *Session::feedLoaded(FeedId id) {
const auto it = _feeds.find(id);
return (it == _feeds.end()) ? nullptr : it->second.get();
}
} // namespace Data

189
Telegram/SourceFiles/data/data_session.h Normal file
View File

@ -0,0 +1,189 @@
/*
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "chat_helpers/stickers.h"
namespace Data {
class Feed;
class Session final {
public:
Session();
~Session();
base::Variable<bool> &contactsLoaded() {
return _contactsLoaded;
}
base::Variable<bool> &allChatsLoaded() {
return _allChatsLoaded;
}
base::Observable<void> &moreChatsLoaded() {
return _moreChatsLoaded;
}
base::Observable<void> &pendingHistoryResize() {
return _pendingHistoryResize;
}
struct ItemVisibilityQuery {
not_null<HistoryItem*> item;
not_null<bool*> isVisible;
};
base::Observable<ItemVisibilityQuery> &queryItemVisibility() {
return _queryItemVisibility;
}
void markItemLayoutChanged(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemLayoutChanged() const;
void requestItemRepaint(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemRepaintRequest() const;
void markItemRemoved(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemRemoved() const;
void markHistoryUnloaded(not_null<const History*> history);
rpl::producer<not_null<const History*>> historyUnloaded() const;
void markHistoryCleared(not_null<const History*> history);
rpl::producer<not_null<const History*>> historyCleared() const;
using MegagroupParticipant = std::tuple<
not_null<ChannelData*>,
not_null<UserData*>>;
void removeMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user);
rpl::producer<MegagroupParticipant> megagroupParticipantRemoved() const;
rpl::producer<not_null<UserData*>> megagroupParticipantRemoved(
not_null<ChannelData*> channel) const;
void addNewMegagroupParticipant(
not_null<ChannelData*> channel,
not_null<UserData*> user);
rpl::producer<MegagroupParticipant> megagroupParticipantAdded() const;
rpl::producer<not_null<UserData*>> megagroupParticipantAdded(
not_null<ChannelData*> channel) const;
void markStickersUpdated();
rpl::producer<> stickersUpdated() const;
void markSavedGifsUpdated();
rpl::producer<> savedGifsUpdated() const;
bool stickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastStickersUpdate, now);
}
void setLastStickersUpdate(TimeMs update) {
_lastStickersUpdate = update;
}
bool recentStickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastRecentStickersUpdate, now);
}
void setLastRecentStickersUpdate(TimeMs update) {
_lastRecentStickersUpdate = update;
}
bool favedStickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastFavedStickersUpdate, now);
}
void setLastFavedStickersUpdate(TimeMs update) {
_lastFavedStickersUpdate = update;
}
bool featuredStickersUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastFeaturedStickersUpdate, now);
}
void setLastFeaturedStickersUpdate(TimeMs update) {
_lastFeaturedStickersUpdate = update;
}
bool savedGifsUpdateNeeded(TimeMs now) const {
return stickersUpdateNeeded(_lastSavedGifsUpdate, now);
}
void setLastSavedGifsUpdate(TimeMs update) {
_lastSavedGifsUpdate = update;
}
int featuredStickerSetsUnreadCount() const {
return _featuredStickerSetsUnreadCount.current();
}
void setFeaturedStickerSetsUnreadCount(int count) {
_featuredStickerSetsUnreadCount = count;
}
rpl::producer<int> featuredStickerSetsUnreadCountValue() const {
return _featuredStickerSetsUnreadCount.value();
}
const Stickers::Sets &stickerSets() const {
return _stickerSets;
}
Stickers::Sets &stickerSetsRef() {
return _stickerSets;
}
const Stickers::Order &stickerSetsOrder() const {
return _stickerSetsOrder;
}
Stickers::Order &stickerSetsOrderRef() {
return _stickerSetsOrder;
}
const Stickers::Order &featuredStickerSetsOrder() const {
return _featuredStickerSetsOrder;
}
Stickers::Order &featuredStickerSetsOrderRef() {
return _featuredStickerSetsOrder;
}
const Stickers::Order &archivedStickerSetsOrder() const {
return _archivedStickerSetsOrder;
}
Stickers::Order &archivedStickerSetsOrderRef() {
return _archivedStickerSetsOrder;
}
const Stickers::SavedGifs &savedGifs() const {
return _savedGifs;
}
Stickers::SavedGifs &savedGifsRef() {
return _savedGifs;
}
HistoryItemsList idsToItems(const MessageIdsList &ids) const;
MessageIdsList itemsToIds(const HistoryItemsList &items) const;
MessageIdsList groupToIds(not_null<HistoryMessageGroup*> group) const;
not_null<Data::Feed*> feed(FeedId id);
Data::Feed *feedLoaded(FeedId id);
private:
bool stickersUpdateNeeded(TimeMs lastUpdate, TimeMs now) const {
constexpr auto kStickersUpdateTimeout = TimeMs(3600'000);
return (lastUpdate == 0)
|| (now >= lastUpdate + kStickersUpdateTimeout);
}
void userIsContactUpdated(not_null<UserData*> user);
base::Variable<bool> _contactsLoaded = { false };
base::Variable<bool> _allChatsLoaded = { false };
base::Observable<void> _moreChatsLoaded;
base::Observable<void> _pendingHistoryResize;
base::Observable<ItemVisibilityQuery> _queryItemVisibility;
rpl::event_stream<not_null<const HistoryItem*>> _itemLayoutChanged;
rpl::event_stream<not_null<const HistoryItem*>> _itemRepaintRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemRemoved;
rpl::event_stream<not_null<const History*>> _historyUnloaded;
rpl::event_stream<not_null<const History*>> _historyCleared;
rpl::event_stream<MegagroupParticipant> _megagroupParticipantRemoved;
rpl::event_stream<MegagroupParticipant> _megagroupParticipantAdded;
rpl::event_stream<> _stickersUpdated;
rpl::event_stream<> _savedGifsUpdated;
TimeMs _lastStickersUpdate = 0;
TimeMs _lastRecentStickersUpdate = 0;
TimeMs _lastFavedStickersUpdate = 0;
TimeMs _lastFeaturedStickersUpdate = 0;
TimeMs _lastSavedGifsUpdate = 0;
rpl::variable<int> _featuredStickerSetsUnreadCount = 0;
Stickers::Sets _stickerSets;
Stickers::Order _stickerSetsOrder;
Stickers::Order _featuredStickerSetsOrder;
Stickers::Order _archivedStickerSetsOrder;
Stickers::SavedGifs _savedGifs;
base::flat_map<FeedId, std::unique_ptr<Data::Feed>> _feeds;
rpl::lifetime _lifetime;
};
} // namespace Data

1
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/text_options.h" #include "ui/text_options.h"
#include "data/data_drafts.h" #include "data/data_drafts.h"
#include "data/data_feed.h" #include "data/data_feed.h"
#include "data/data_session.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "mainwidget.h" #include "mainwidget.h"

1
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_slide_animation.h" #include "window/window_slide_animation.h"
#include "profile/profile_channel_controllers.h" #include "profile/profile_channel_controllers.h"
#include "storage/storage_media_prepare.h" #include "storage/storage_media_prepare.h"
#include "data/data_session.h"
namespace { namespace {

1
Telegram/SourceFiles/facades.cpp
View File

@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/observer.h" #include "base/observer.h"
#include "history/history_media.h" #include "history/history_media.h"
#include "styles/style_history.h" #include "styles/style_history.h"
#include "data/data_session.h"
Q_DECLARE_METATYPE(ClickHandlerPtr); Q_DECLARE_METATYPE(ClickHandlerPtr);
Q_DECLARE_METATYPE(Qt::MouseButton); Q_DECLARE_METATYPE(Qt::MouseButton);

1
Telegram/SourceFiles/history/history.cpp
View File

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "dialogs/dialogs_indexed_list.h" #include "dialogs/dialogs_indexed_list.h"
#include "styles/style_dialogs.h" #include "styles/style_dialogs.h"
#include "data/data_drafts.h" #include "data/data_drafts.h"
#include "data/data_session.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "mainwidget.h" #include "mainwidget.h"

3
Telegram/SourceFiles/history/history_admin_log_inner.cpp
View File

@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/overload.h" #include "base/overload.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "boxes/edit_participant_box.h" #include "boxes/edit_participant_box.h"
#include "data/data_session.h"
namespace AdminLog { namespace AdminLog {
namespace { namespace {
@ -214,7 +215,7 @@ InnerWidget::InnerWidget(
} }
}, lifetime()); }, lifetime());
subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); }); subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); });
subscribe(Auth().data().queryItemVisibility(), [this](const AuthSessionData::ItemVisibilityQuery &query) { subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) {
if (_history != query.item->history() || !query.item->isLogEntry() || !isVisible()) { if (_history != query.item->history() || !query.item->isLogEntry() || !isVisible()) {
return; return;
} }

1
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "messenger.h" #include "messenger.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "data/data_session.h"
namespace { namespace {

1
Telegram/SourceFiles/history/history_item.cpp
View File

@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h" #include "mainwindow.h"
#include "window/window_controller.h" #include "window/window_controller.h"
#include "core/crash_reports.h" #include "core/crash_reports.h"
#include "data/data_session.h"
namespace { namespace {

1
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/empty_userpic.h" #include "ui/empty_userpic.h"
#include "ui/grouped_layout.h" #include "ui/grouped_layout.h"
#include "ui/text_options.h" #include "ui/text_options.h"
#include "data/data_session.h"
namespace { namespace {

1
Telegram/SourceFiles/history/history_message.cpp
View File

@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_controller.h" #include "window/window_controller.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "storage/storage_shared_media.h" #include "storage/storage_shared_media.h"
#include "data/data_session.h"
namespace { namespace {

16
Telegram/SourceFiles/history/history_top_bar_widget.cpp
View File

@ -112,8 +112,8 @@ HistoryTopBarWidget::HistoryTopBarWidget(
}); });
rpl::combine( rpl::combine(
Auth().data().thirdSectionInfoEnabledValue(), Auth().settings().thirdSectionInfoEnabledValue(),
Auth().data().tabbedReplacedWithInfoValue() Auth().settings().tabbedReplacedWithInfoValue()
) | rpl::start_with_next( ) | rpl::start_with_next(
[this] { updateInfoToggleActive(); }, [this] { updateInfoToggleActive(); },
lifetime()); lifetime());
@ -186,13 +186,13 @@ void HistoryTopBarWidget::showMenu() {
void HistoryTopBarWidget::toggleInfoSection() { void HistoryTopBarWidget::toggleInfoSection() {
if (Adaptive::ThreeColumn() if (Adaptive::ThreeColumn()
&& (Auth().data().thirdSectionInfoEnabled() && (Auth().settings().thirdSectionInfoEnabled()
|| Auth().data().tabbedReplacedWithInfo())) { || Auth().settings().tabbedReplacedWithInfo())) {
_controller->closeThirdSection(); _controller->closeThirdSection();
} else if (_historyPeer) { } else if (_historyPeer) {
if (_controller->canShowThirdSection()) { if (_controller->canShowThirdSection()) {
Auth().data().setThirdSectionInfoEnabled(true); Auth().settings().setThirdSectionInfoEnabled(true);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
if (Adaptive::ThreeColumn()) { if (Adaptive::ThreeColumn()) {
_controller->showSection( _controller->showSection(
Info::Memento::Default(_historyPeer), Info::Memento::Default(_historyPeer),
@ -598,8 +598,8 @@ void HistoryTopBarWidget::updateUnreadBadge() {
void HistoryTopBarWidget::updateInfoToggleActive() { void HistoryTopBarWidget::updateInfoToggleActive() {
auto infoThirdActive = Adaptive::ThreeColumn() auto infoThirdActive = Adaptive::ThreeColumn()
&& (Auth().data().thirdSectionInfoEnabled() && (Auth().settings().thirdSectionInfoEnabled()
|| Auth().data().tabbedReplacedWithInfo()); || Auth().settings().tabbedReplacedWithInfo());
auto iconOverride = infoThirdActive auto iconOverride = infoThirdActive
? &st::topBarInfoActive ? &st::topBarInfoActive
: nullptr; : nullptr;

11
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/effects/ripple_animation.h" #include "ui/effects/ripple_animation.h"
#include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_result.h"
#include "data/data_drafts.h" #include "data/data_drafts.h"
#include "data/data_session.h"
#include "history/history_message.h" #include "history/history_message.h"
#include "history/history_service_layout.h" #include "history/history_service_layout.h"
#include "history/history_media_types.h" #include "history/history_media_types.h"
@ -624,7 +625,7 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
} }
})); }));
subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryUpdate(); }); subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryUpdate(); });
subscribe(Auth().data().queryItemVisibility(), [this](const AuthSessionData::ItemVisibilityQuery &query) { subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) {
if (_a_show.animating() || _history != query.item->history() || query.item->detached() || !isVisible()) { if (_a_show.animating() || _history != query.item->history() || query.item->detached() || !isVisible()) {
return; return;
} }
@ -3736,11 +3737,11 @@ void HistoryWidget::pushTabbedSelectorToThirdSection(
if (!_history || !_tabbedPanel) { if (!_history || !_tabbedPanel) {
return; return;
} else if (!_canSendMessages) { } else if (!_canSendMessages) {
Auth().data().setTabbedReplacedWithInfo(true); Auth().settings().setTabbedReplacedWithInfo(true);
controller()->showPeerInfo(_peer, params.withThirdColumn()); controller()->showPeerInfo(_peer, params.withThirdColumn());
return; return;
} }
Auth().data().setTabbedReplacedWithInfo(false); Auth().settings().setTabbedReplacedWithInfo(false);
_tabbedSelectorToggle->setColorOverrides( _tabbedSelectorToggle->setColorOverrides(
&st::historyAttachEmojiActive, &st::historyAttachEmojiActive,
&st::historyRecordVoiceFgActive, &st::historyRecordVoiceFgActive,
@ -3771,8 +3772,8 @@ void HistoryWidget::toggleTabbedSelectorMode() {
if (_tabbedPanel) { if (_tabbedPanel) {
if (controller()->canShowThirdSection() if (controller()->canShowThirdSection()
&& !Adaptive::OneColumn()) { && !Adaptive::OneColumn()) {
Auth().data().setTabbedSelectorSectionEnabled(true); Auth().settings().setTabbedSelectorSectionEnabled(true);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
pushTabbedSelectorToThirdSection( pushTabbedSelectorToThirdSection(
Window::SectionShow::Way::ClearStack); Window::SectionShow::Way::ClearStack);
} else { } else {

6
Telegram/SourceFiles/info/info_layer_widget.cpp
View File

@ -108,10 +108,10 @@ bool LayerWidget::takeToThirdSection() {
//// shrink the window size. //// shrink the window size.
//// ////
//// See https://github.com/telegramdesktop/tdesktop/issues/4091 //// See https://github.com/telegramdesktop/tdesktop/issues/4091
//Auth().data().setThirdSectionExtendedBy(0); //Auth().settings().setThirdSectionExtendedBy(0);
//Auth().data().setThirdSectionInfoEnabled(true); //Auth().settings().setThirdSectionInfoEnabled(true);
//Auth().saveDataDelayed(); //Auth().saveSettingsDelayed();
//localCopy->showSection( //localCopy->showSection(
// std::move(memento), // std::move(memento),
// Window::SectionShow( // Window::SectionShow(

1
Telegram/SourceFiles/info/media/info_media_list_widget.cpp
View File

@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peer_list_controllers.h" #include "boxes/peer_list_controllers.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "core/file_utilities.h" #include "core/file_utilities.h"
#include "data/data_session.h"
namespace Layout = Overview::Layout; namespace Layout = Overview::Layout;

1
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_photo.h" #include "data/data_photo.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "styles/style_overview.h" #include "styles/style_overview.h"
#include "styles/style_history.h" #include "styles/style_history.h"
#include "styles/style_chat_helpers.h" #include "styles/style_chat_helpers.h"

77
Telegram/SourceFiles/mainwidget.cpp
View File

@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/section_memento.h" #include "window/section_memento.h"
#include "window/section_widget.h" #include "window/section_widget.h"
#include "data/data_drafts.h" #include "data/data_drafts.h"
#include "data/data_session.h"
#include "ui/widgets/dropdown_menu.h" #include "ui/widgets/dropdown_menu.h"
#include "ui/focus_persister.h" #include "ui/focus_persister.h"
#include "ui/resize_area.h" #include "ui/resize_area.h"
@ -222,9 +223,9 @@ MainWidget::MainWidget(
updateDialogsWidthAnimated(); updateDialogsWidthAnimated();
}); });
rpl::merge( rpl::merge(
Auth().data().dialogsWidthRatioChanges() Auth().settings().dialogsWidthRatioChanges()
| rpl::map([] { return rpl::empty_value(); }), | rpl::map([] { return rpl::empty_value(); }),
Auth().data().thirdColumnWidthChanges() Auth().settings().thirdColumnWidthChanges()
| rpl::map([] { return rpl::empty_value(); }) | rpl::map([] { return rpl::empty_value(); })
) | rpl::start_with_next( ) | rpl::start_with_next(
[this] { updateControlsGeometry(); }, [this] { updateControlsGeometry(); },
@ -331,8 +332,8 @@ void MainWidget::checkCurrentFloatPlayer() {
}, [this](not_null<Float*> instance, bool closed) { }, [this](not_null<Float*> instance, bool closed) {
finishFloatPlayerDrag(instance, closed); finishFloatPlayerDrag(instance, closed);
})); }));
currentFloatPlayer()->column = Auth().data().floatPlayerColumn(); currentFloatPlayer()->column = Auth().settings().floatPlayerColumn();
currentFloatPlayer()->corner = Auth().data().floatPlayerCorner(); currentFloatPlayer()->corner = Auth().settings().floatPlayerCorner();
checkFloatPlayerVisibility(); checkFloatPlayerVisibility();
} }
} }
@ -498,8 +499,8 @@ void MainWidget::updateFloatPlayerColumnCorner(QPoint center) {
Expects(!_playerFloats.empty()); Expects(!_playerFloats.empty());
auto size = _playerFloats.back()->widget->size(); auto size = _playerFloats.back()->widget->size();
auto min = INT_MAX; auto min = INT_MAX;
auto column = Auth().data().floatPlayerColumn(); auto column = Auth().settings().floatPlayerColumn();
auto corner = Auth().data().floatPlayerCorner(); auto corner = Auth().settings().floatPlayerCorner();
auto checkSection = [this, center, size, &min, &column, &corner]( auto checkSection = [this, center, size, &min, &column, &corner](
Window::AbstractSectionWidget *widget, Window::AbstractSectionWidget *widget,
Window::Column widgetColumn) { Window::Column widgetColumn) {
@ -550,13 +551,13 @@ void MainWidget::updateFloatPlayerColumnCorner(QPoint center) {
checkSection(_dialogs, Window::Column::First); checkSection(_dialogs, Window::Column::First);
} }
} }
if (Auth().data().floatPlayerColumn() != column) { if (Auth().settings().floatPlayerColumn() != column) {
Auth().data().setFloatPlayerColumn(column); Auth().settings().setFloatPlayerColumn(column);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
} }
if (Auth().data().floatPlayerCorner() != corner) { if (Auth().settings().floatPlayerCorner() != corner) {
Auth().data().setFloatPlayerCorner(corner); Auth().settings().setFloatPlayerCorner(corner);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
} }
} }
@ -568,8 +569,8 @@ void MainWidget::finishFloatPlayerDrag(not_null<Float*> instance, bool closed) {
instance->animationSide = getFloatPlayerSide(center); instance->animationSide = getFloatPlayerSide(center);
} }
updateFloatPlayerColumnCorner(center); updateFloatPlayerColumnCorner(center);
instance->column = Auth().data().floatPlayerColumn(); instance->column = Auth().settings().floatPlayerColumn();
instance->corner = Auth().data().floatPlayerCorner(); instance->corner = Auth().settings().floatPlayerCorner();
instance->draggedAnimation.finish(); instance->draggedAnimation.finish();
instance->draggedAnimation.start([this, instance] { updateFloatPlayerPosition(instance); }, 0., 1., st::slideDuration, anim::sineInOut); instance->draggedAnimation.start([this, instance] { updateFloatPlayerPosition(instance); }, 0., 1., st::slideDuration, anim::sineInOut);
@ -3129,7 +3130,7 @@ void MainWidget::resizeEvent(QResizeEvent *e) {
void MainWidget::updateControlsGeometry() { void MainWidget::updateControlsGeometry() {
updateWindowAdaptiveLayout(); updateWindowAdaptiveLayout();
if (Auth().data().dialogsWidthRatio() > 0) { if (Auth().settings().dialogsWidthRatio() > 0) {
_a_dialogsWidth.finish(); _a_dialogsWidth.finish();
} }
if (!_a_dialogsWidth.animating()) { if (!_a_dialogsWidth.animating()) {
@ -3142,9 +3143,9 @@ void MainWidget::updateControlsGeometry() {
Window::SectionShow::Way::ClearStack, Window::SectionShow::Way::ClearStack,
anim::type::instant, anim::type::instant,
anim::activation::background); anim::activation::background);
if (Auth().data().tabbedSelectorSectionEnabled()) { if (Auth().settings().tabbedSelectorSectionEnabled()) {
_history->pushTabbedSelectorToThirdSection(params); _history->pushTabbedSelectorToThirdSection(params);
} else if (Auth().data().thirdSectionInfoEnabled()) { } else if (Auth().settings().thirdSectionInfoEnabled()) {
_history->pushInfoToThirdSection(params); _history->pushInfoToThirdSection(params);
} }
} }
@ -3266,14 +3267,14 @@ void MainWidget::ensureFirstColumnResizeAreaCreated() {
auto newRatio = (newWidth < st::columnMinimalWidthLeft / 2) auto newRatio = (newWidth < st::columnMinimalWidthLeft / 2)
? 0. ? 0.
: float64(newWidth) / width(); : float64(newWidth) / width();
Auth().data().setDialogsWidthRatio(newRatio); Auth().settings().setDialogsWidthRatio(newRatio);
}; };
auto moveFinishedCallback = [=] { auto moveFinishedCallback = [=] {
if (Adaptive::OneColumn()) { if (Adaptive::OneColumn()) {
return; return;
} }
if (Auth().data().dialogsWidthRatio() > 0) { if (Auth().settings().dialogsWidthRatio() > 0) {
Auth().data().setDialogsWidthRatio( Auth().settings().setDialogsWidthRatio(
float64(_dialogsWidth) / width()); float64(_dialogsWidth) / width());
} }
Local::writeUserSettings(); Local::writeUserSettings();
@ -3290,14 +3291,14 @@ void MainWidget::ensureThirdColumnResizeAreaCreated() {
} }
auto moveLeftCallback = [=](int globalLeft) { auto moveLeftCallback = [=](int globalLeft) {
auto newWidth = mapToGlobal(QPoint(width(), 0)).x() - globalLeft; auto newWidth = mapToGlobal(QPoint(width(), 0)).x() - globalLeft;
Auth().data().setThirdColumnWidth(newWidth); Auth().settings().setThirdColumnWidth(newWidth);
}; };
auto moveFinishedCallback = [=] { auto moveFinishedCallback = [=] {
if (!Adaptive::ThreeColumn() || !_thirdSection) { if (!Adaptive::ThreeColumn() || !_thirdSection) {
return; return;
} }
Auth().data().setThirdColumnWidth(snap( Auth().settings().setThirdColumnWidth(snap(
Auth().data().thirdColumnWidth(), Auth().settings().thirdColumnWidth(),
st::columnMinimalWidthThird, st::columnMinimalWidthThird,
st::columnMaximalWidthThird)); st::columnMaximalWidthThird));
Local::writeUserSettings(); Local::writeUserSettings();
@ -3309,12 +3310,12 @@ void MainWidget::ensureThirdColumnResizeAreaCreated() {
} }
void MainWidget::updateDialogsWidthAnimated() { void MainWidget::updateDialogsWidthAnimated() {
if (Auth().data().dialogsWidthRatio() > 0) { if (Auth().settings().dialogsWidthRatio() > 0) {
return; return;
} }
auto dialogsWidth = _dialogsWidth; auto dialogsWidth = _dialogsWidth;
updateWindowAdaptiveLayout(); updateWindowAdaptiveLayout();
if (!Auth().data().dialogsWidthRatio() if (!Auth().settings().dialogsWidthRatio()
&& (_dialogsWidth != dialogsWidth && (_dialogsWidth != dialogsWidth
|| _a_dialogsWidth.animating())) { || _a_dialogsWidth.animating())) {
_dialogs->startWidthAnimation(); _dialogs->startWidthAnimation();
@ -3366,9 +3367,9 @@ void MainWidget::updateThirdColumnToCurrentPeer(
// Like in _controller->showPeerInfo() // Like in _controller->showPeerInfo()
// //
if (Adaptive::ThreeColumn() if (Adaptive::ThreeColumn()
&& !Auth().data().thirdSectionInfoEnabled()) { && !Auth().settings().thirdSectionInfoEnabled()) {
Auth().data().setThirdSectionInfoEnabled(true); Auth().settings().setThirdSectionInfoEnabled(true);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
} }
_controller->showSection( _controller->showSection(
@ -3380,18 +3381,18 @@ void MainWidget::updateThirdColumnToCurrentPeer(
_history->pushTabbedSelectorToThirdSection(params); _history->pushTabbedSelectorToThirdSection(params);
}; };
if (Adaptive::ThreeColumn() if (Adaptive::ThreeColumn()
&& Auth().data().tabbedSelectorSectionEnabled() && Auth().settings().tabbedSelectorSectionEnabled()
&& peer) { && peer) {
if (!canWrite) { if (!canWrite) {
switchInfoFast(); switchInfoFast();
Auth().data().setTabbedSelectorSectionEnabled(true); Auth().settings().setTabbedSelectorSectionEnabled(true);
Auth().data().setTabbedReplacedWithInfo(true); Auth().settings().setTabbedReplacedWithInfo(true);
} else if (Auth().data().tabbedReplacedWithInfo()) { } else if (Auth().settings().tabbedReplacedWithInfo()) {
Auth().data().setTabbedReplacedWithInfo(false); Auth().settings().setTabbedReplacedWithInfo(false);
switchTabbedFast(); switchTabbedFast();
} }
} else { } else {
Auth().data().setTabbedReplacedWithInfo(false); Auth().settings().setTabbedReplacedWithInfo(false);
if (!peer) { if (!peer) {
if (_thirdSection) { if (_thirdSection) {
_thirdSection.destroy(); _thirdSection.destroy();
@ -3399,7 +3400,7 @@ void MainWidget::updateThirdColumnToCurrentPeer(
updateControlsGeometry(); updateControlsGeometry();
} }
} else if (Adaptive::ThreeColumn() } else if (Adaptive::ThreeColumn()
&& Auth().data().thirdSectionInfoEnabled()) { && Auth().settings().thirdSectionInfoEnabled()) {
switchInfoFast(); switchInfoFast();
} }
} }
@ -3474,13 +3475,13 @@ void MainWidget::handleAdaptiveLayoutUpdate() {
void MainWidget::updateWindowAdaptiveLayout() { void MainWidget::updateWindowAdaptiveLayout() {
auto layout = _controller->computeColumnLayout(); auto layout = _controller->computeColumnLayout();
auto dialogsWidthRatio = Auth().data().dialogsWidthRatio(); auto dialogsWidthRatio = Auth().settings().dialogsWidthRatio();
// Check if we are in a single-column layout in a wide enough window // Check if we are in a single-column layout in a wide enough window
// for the normal layout. If so, switch to the normal layout. // for the normal layout. If so, switch to the normal layout.
if (layout.windowLayout == Adaptive::WindowLayout::OneColumn) { if (layout.windowLayout == Adaptive::WindowLayout::OneColumn) {
auto chatWidth = layout.chatWidth; auto chatWidth = layout.chatWidth;
//if (Auth().data().tabbedSelectorSectionEnabled() //if (Auth().settings().tabbedSelectorSectionEnabled()
// && chatWidth >= _history->minimalWidthForTabbedSelectorSection()) { // && chatWidth >= _history->minimalWidthForTabbedSelectorSection()) {
// chatWidth -= _history->tabbedSelectorSectionWidth(); // chatWidth -= _history->tabbedSelectorSectionWidth();
//} //}
@ -3517,7 +3518,7 @@ void MainWidget::updateWindowAdaptiveLayout() {
//} //}
} }
Auth().data().setDialogsWidthRatio(dialogsWidthRatio); Auth().settings().setDialogsWidthRatio(dialogsWidthRatio);
auto useSmallColumnWidth = !Adaptive::OneColumn() auto useSmallColumnWidth = !Adaptive::OneColumn()
&& !dialogsWidthRatio && !dialogsWidthRatio

1
Telegram/SourceFiles/media/player/media_player_float.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <rpl/merge.h> #include <rpl/merge.h>
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "history/history_media.h" #include "history/history_media.h"
#include "media/media_clip_reader.h" #include "media/media_clip_reader.h"
#include "media/view/media_clip_playback.h" #include "media/view/media_clip_playback.h"

2
Telegram/SourceFiles/mediaview.cpp
View File

@ -1870,7 +1870,7 @@ void MediaView::onVideoPlayProgress(const AudioMsgId &audioId) {
if (state.length) { if (state.length) {
updateVideoPlaybackState(state); updateVideoPlaybackState(state);
} }
Auth().data().setLastTimeVideoPlayedAt(getms(true)); Auth().settings().setLastTimeVideoPlayedAt(getms(true));
} }
} }

14
Telegram/SourceFiles/messenger.cpp
View File

@ -57,7 +57,7 @@ Messenger *Messenger::InstancePointer() {
struct Messenger::Private { struct Messenger::Private {
UserId authSessionUserId = 0; UserId authSessionUserId = 0;
std::unique_ptr<AuthSessionData> storedAuthSession; std::unique_ptr<AuthSessionSettings> storedAuthSession;
MTP::Instance::Config mtpConfig; MTP::Instance::Config mtpConfig;
MTP::AuthKeysList mtpKeysToDestroy; MTP::AuthKeysList mtpKeysToDestroy;
base::Timer quitTimer; base::Timer quitTimer;
@ -332,16 +332,18 @@ void Messenger::setAuthSessionUserId(UserId userId) {
_private->authSessionUserId = userId; _private->authSessionUserId = userId;
} }
void Messenger::setAuthSessionFromStorage(std::unique_ptr<AuthSessionData> data) { void Messenger::setAuthSessionFromStorage(std::unique_ptr<AuthSessionSettings> data) {
Expects(!authSession()); Expects(!authSession());
_private->storedAuthSession = std::move(data); _private->storedAuthSession = std::move(data);
} }
AuthSessionData *Messenger::getAuthSessionData() { AuthSessionSettings *Messenger::getAuthSessionSettings() {
if (_private->authSessionUserId) { if (_private->authSessionUserId) {
return _private->storedAuthSession ? _private->storedAuthSession.get() : nullptr; return _private->storedAuthSession
? _private->storedAuthSession.get()
: nullptr;
} else if (_authSession) { } else if (_authSession) {
return &_authSession->data(); return &_authSession->settings();
} }
return nullptr; return nullptr;
} }
@ -409,7 +411,7 @@ void Messenger::startMtp() {
} }
if (_private->storedAuthSession) { if (_private->storedAuthSession) {
if (_authSession) { if (_authSession) {
_authSession->data().moveFrom( _authSession->settings().moveFrom(
std::move(*_private->storedAuthSession)); std::move(*_private->storedAuthSession));
} }
_private->storedAuthSession.reset(); _private->storedAuthSession.reset();

7
Telegram/SourceFiles/messenger.h
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/timer.h" #include "base/timer.h"
class AuthSession; class AuthSession;
class AuthSessionData; class AuthSessionSettings;
class MainWidget; class MainWidget;
class FileUploader; class FileUploader;
class Translator; class Translator;
@ -103,8 +103,9 @@ public:
void setMtpMainDcId(MTP::DcId mainDcId); void setMtpMainDcId(MTP::DcId mainDcId);
void setMtpKey(MTP::DcId dcId, const MTP::AuthKey::Data &keyData); void setMtpKey(MTP::DcId dcId, const MTP::AuthKey::Data &keyData);
void setAuthSessionUserId(UserId userId); void setAuthSessionUserId(UserId userId);
void setAuthSessionFromStorage(std::unique_ptr<AuthSessionData> data); void setAuthSessionFromStorage(
AuthSessionData *getAuthSessionData(); std::unique_ptr<AuthSessionSettings> data);
AuthSessionSettings *getAuthSessionSettings();
// Serialization. // Serialization.
QByteArray serializeMtpAuthorization() const; QByteArray serializeMtpAuthorization() const;

1
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "overview/overview_layout.h" #include "overview/overview_layout.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "data/data_session.h"
#include "styles/style_overview.h" #include "styles/style_overview.h"
#include "styles/style_history.h" #include "styles/style_history.h"
#include "core/file_utilities.h" #include "core/file_utilities.h"

1
Telegram/SourceFiles/profile/profile_channel_controllers.cpp
View File

@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "observer_peer.h" #include "observer_peer.h"
#include "dialogs/dialogs_indexed_list.h" #include "dialogs/dialogs_indexed_list.h"
#include "data/data_peer_values.h" #include "data/data_peer_values.h"
#include "data/data_session.h"
#include "ui/widgets/popup_menu.h" #include "ui/widgets/popup_menu.h"
#include "window/window_controller.h" #include "window/window_controller.h"

4
Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
View File

@ -256,14 +256,14 @@ QString LastSeenPrivacyController::exceptionsDescription() {
} }
void LastSeenPrivacyController::confirmSave(bool someAreDisallowed, base::lambda_once<void()> saveCallback) { void LastSeenPrivacyController::confirmSave(bool someAreDisallowed, base::lambda_once<void()> saveCallback) {
if (someAreDisallowed && !Auth().data().lastSeenWarningSeen()) { if (someAreDisallowed && !Auth().settings().lastSeenWarningSeen()) {
auto weakBox = std::make_shared<QPointer<ConfirmBox>>(); auto weakBox = std::make_shared<QPointer<ConfirmBox>>();
auto callback = [weakBox, saveCallback = std::move(saveCallback)]() mutable { auto callback = [weakBox, saveCallback = std::move(saveCallback)]() mutable {
if (auto box = *weakBox) { if (auto box = *weakBox) {
box->closeBox(); box->closeBox();
} }
saveCallback(); saveCallback();
Auth().data().setLastSeenWarningSeen(true); Auth().settings().setLastSeenWarningSeen(true);
Local::writeUserSettings(); Local::writeUserSettings();
}; };
auto box = Box<ConfirmBox>(lang(lng_edit_privacy_lastseen_warning), lang(lng_continue), lang(lng_cancel), std::move(callback)); auto box = Box<ConfirmBox>(lang(lng_edit_privacy_lastseen_warning), lang(lng_continue), lang(lng_cancel), std::move(callback));

4
Telegram/SourceFiles/settings/settings_widget.cpp
View File

@ -131,7 +131,7 @@ void fillCodes() {
if (track->failed()) { if (track->failed()) {
Ui::show(Box<InformBox>("Could not audio :( Errors in 'log.txt'.")); Ui::show(Box<InformBox>("Could not audio :( Errors in 'log.txt'."));
} else { } else {
Auth().data().setSoundOverride(key, result.paths.front()); Auth().settings().setSoundOverride(key, result.paths.front());
Local::writeUserSettings(); Local::writeUserSettings();
} }
} }
@ -140,7 +140,7 @@ void fillCodes() {
} }
Codes.insert(qsl("sounds_reset"), [] { Codes.insert(qsl("sounds_reset"), [] {
if (AuthSession::Exists()) { if (AuthSession::Exists()) {
Auth().data().clearSoundOverrides(); Auth().settings().clearSoundOverrides();
Local::writeUserSettings(); Local::writeUserSettings();
Ui::show(Box<InformBox>("All sound overrides were reset.")); Ui::show(Box<InformBox>("All sound overrides were reset."));
} }

21
Telegram/SourceFiles/storage/localstorage.cpp
View File

@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "auth_session.h" #include "auth_session.h"
#include "window/window_controller.h" #include "window/window_controller.h"
#include "base/flags.h" #include "base/flags.h"
#include "data/data_session.h"
#include <openssl/evp.h> #include <openssl/evp.h>
@ -564,7 +565,7 @@ enum {
dbiDcOptions = 0x4a, dbiDcOptions = 0x4a,
dbiMtpAuthorization = 0x4b, dbiMtpAuthorization = 0x4b,
dbiLastSeenWarningSeenOld = 0x4c, dbiLastSeenWarningSeenOld = 0x4c,
dbiAuthSessionData = 0x4d, dbiAuthSessionSettings = 0x4d,
dbiLangPackKey = 0x4e, dbiLangPackKey = 0x4e,
dbiConnectionType = 0x4f, dbiConnectionType = 0x4f,
dbiStickersFavedLimit = 0x50, dbiStickersFavedLimit = 0x50,
@ -634,10 +635,10 @@ enum class WriteMapWhen {
Soon, Soon,
}; };
std::unique_ptr<AuthSessionData> StoredAuthSessionCache; std::unique_ptr<AuthSessionSettings> StoredAuthSessionCache;
AuthSessionData &GetStoredAuthSessionCache() { AuthSessionSettings &GetStoredAuthSessionCache() {
if (!StoredAuthSessionCache) { if (!StoredAuthSessionCache) {
StoredAuthSessionCache = std::make_unique<AuthSessionData>(); StoredAuthSessionCache = std::make_unique<AuthSessionSettings>();
} }
return *StoredAuthSessionCache; return *StoredAuthSessionCache;
} }
@ -1106,7 +1107,7 @@ bool _readSetting(quint32 blockId, QDataStream &stream, int version, ReadSetting
GetStoredAuthSessionCache().setLastSeenWarningSeen(v == 1); GetStoredAuthSessionCache().setLastSeenWarningSeen(v == 1);
} break; } break;
case dbiAuthSessionData: { case dbiAuthSessionSettings: {
QByteArray v; QByteArray v;
stream >> v; stream >> v;
if (!_checkStreamStatus(stream)) return false; if (!_checkStreamStatus(stream)) return false;
@ -1756,8 +1757,12 @@ void _writeUserSettings() {
recentEmojiPreloadData.push_back(qMakePair(item.first->id(), item.second)); recentEmojiPreloadData.push_back(qMakePair(item.first->id(), item.second));
} }
} }
auto userDataInstance = StoredAuthSessionCache ? StoredAuthSessionCache.get() : Messenger::Instance().getAuthSessionData(); auto userDataInstance = StoredAuthSessionCache
auto userData = userDataInstance ? userDataInstance->serialize() : QByteArray(); ? StoredAuthSessionCache.get()
: Messenger::Instance().getAuthSessionSettings();
auto userData = userDataInstance
? userDataInstance->serialize()
: QByteArray();
uint32 size = 21 * (sizeof(quint32) + sizeof(qint32)); uint32 size = 21 * (sizeof(quint32) + sizeof(qint32));
size += sizeof(quint32) + Serialize::stringSize(Global::AskDownloadPath() ? QString() : Global::DownloadPath()) + Serialize::bytearraySize(Global::AskDownloadPath() ? QByteArray() : Global::DownloadPathBookmark()); size += sizeof(quint32) + Serialize::stringSize(Global::AskDownloadPath() ? QString() : Global::DownloadPath()) + Serialize::bytearraySize(Global::AskDownloadPath() ? QByteArray() : Global::DownloadPathBookmark());
@ -1803,7 +1808,7 @@ void _writeUserSettings() {
data.stream << quint32(dbiAutoPlay) << qint32(cAutoPlayGif() ? 1 : 0); data.stream << quint32(dbiAutoPlay) << qint32(cAutoPlayGif() ? 1 : 0);
data.stream << quint32(dbiUseExternalVideoPlayer) << qint32(cUseExternalVideoPlayer()); data.stream << quint32(dbiUseExternalVideoPlayer) << qint32(cUseExternalVideoPlayer());
if (!userData.isEmpty()) { if (!userData.isEmpty()) {
data.stream << quint32(dbiAuthSessionData) << userData; data.stream << quint32(dbiAuthSessionSettings) << userData;
} }
{ {

3
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@ -364,7 +364,8 @@ void System::ensureSoundCreated() {
} }
_soundTrack = Media::Audio::Current().createTrack(); _soundTrack = Media::Audio::Current().createTrack();
_soundTrack->fillFromFile(Auth().data().getSoundPath(qsl("msg_incoming"))); _soundTrack->fillFromFile(
Auth().settings().getSoundPath(qsl("msg_incoming")));
} }
void System::updateAll() { void System::updateAll() {

48
Telegram/SourceFiles/window/window_controller.cpp
View File

@ -84,8 +84,8 @@ Controller::ColumnLayout Controller::computeColumnLayout() const {
if (bodyWidth < minimalThreeColumnWidth()) { if (bodyWidth < minimalThreeColumnWidth()) {
return true; return true;
} }
if (!Auth().data().tabbedSelectorSectionEnabled() if (!Auth().settings().tabbedSelectorSectionEnabled()
&& !Auth().data().thirdSectionInfoEnabled()) { && !Auth().settings().thirdSectionInfoEnabled()) {
return true; return true;
} }
return false; return false;
@ -115,14 +115,14 @@ Controller::ColumnLayout Controller::computeColumnLayout() const {
} }
int Controller::countDialogsWidthFromRatio(int bodyWidth) const { int Controller::countDialogsWidthFromRatio(int bodyWidth) const {
auto result = qRound(bodyWidth * Auth().data().dialogsWidthRatio()); auto result = qRound(bodyWidth * Auth().settings().dialogsWidthRatio());
accumulate_max(result, st::columnMinimalWidthLeft); accumulate_max(result, st::columnMinimalWidthLeft);
// accumulate_min(result, st::columnMaximalWidthLeft); // accumulate_min(result, st::columnMaximalWidthLeft);
return result; return result;
} }
int Controller::countThirdColumnWidthFromRatio(int bodyWidth) const { int Controller::countThirdColumnWidthFromRatio(int bodyWidth) const {
auto result = Auth().data().thirdColumnWidth(); auto result = Auth().settings().thirdColumnWidth();
accumulate_max(result, st::columnMinimalWidthThird); accumulate_max(result, st::columnMinimalWidthThird);
accumulate_min(result, st::columnMaximalWidthThird); accumulate_min(result, st::columnMaximalWidthThird);
return result; return result;
@ -175,11 +175,11 @@ void Controller::resizeForThirdSection() {
auto layout = computeColumnLayout(); auto layout = computeColumnLayout();
auto tabbedSelectorSectionEnabled = auto tabbedSelectorSectionEnabled =
Auth().data().tabbedSelectorSectionEnabled(); Auth().settings().tabbedSelectorSectionEnabled();
auto thirdSectionInfoEnabled = auto thirdSectionInfoEnabled =
Auth().data().thirdSectionInfoEnabled(); Auth().settings().thirdSectionInfoEnabled();
Auth().data().setTabbedSelectorSectionEnabled(false); Auth().settings().setTabbedSelectorSectionEnabled(false);
Auth().data().setThirdSectionInfoEnabled(false); Auth().settings().setThirdSectionInfoEnabled(false);
auto wanted = countThirdColumnWidthFromRatio(layout.bodyWidth); auto wanted = countThirdColumnWidthFromRatio(layout.bodyWidth);
auto minimal = st::columnMinimalWidthThird; auto minimal = st::columnMinimalWidthThird;
@ -200,20 +200,20 @@ void Controller::resizeForThirdSection() {
return window()->tryToExtendWidthBy(minimal); return window()->tryToExtendWidthBy(minimal);
}(); }();
if (extendedBy) { if (extendedBy) {
if (extendBy != Auth().data().thirdColumnWidth()) { if (extendBy != Auth().settings().thirdColumnWidth()) {
Auth().data().setThirdColumnWidth(extendBy); Auth().settings().setThirdColumnWidth(extendBy);
} }
auto newBodyWidth = layout.bodyWidth + extendedBy; auto newBodyWidth = layout.bodyWidth + extendedBy;
auto currentRatio = Auth().data().dialogsWidthRatio(); auto currentRatio = Auth().settings().dialogsWidthRatio();
Auth().data().setDialogsWidthRatio( Auth().settings().setDialogsWidthRatio(
(currentRatio * layout.bodyWidth) / newBodyWidth); (currentRatio * layout.bodyWidth) / newBodyWidth);
} }
auto savedValue = (extendedBy == extendBy) ? -1 : extendedBy; auto savedValue = (extendedBy == extendBy) ? -1 : extendedBy;
Auth().data().setThirdSectionExtendedBy(savedValue); Auth().settings().setThirdSectionExtendedBy(savedValue);
Auth().data().setTabbedSelectorSectionEnabled( Auth().settings().setTabbedSelectorSectionEnabled(
tabbedSelectorSectionEnabled); tabbedSelectorSectionEnabled);
Auth().data().setThirdSectionInfoEnabled( Auth().settings().setThirdSectionInfoEnabled(
thirdSectionInfoEnabled); thirdSectionInfoEnabled);
} }
@ -223,23 +223,23 @@ void Controller::closeThirdSection() {
if (layout.windowLayout == Adaptive::WindowLayout::ThreeColumn) { if (layout.windowLayout == Adaptive::WindowLayout::ThreeColumn) {
auto noResize = window()->isFullScreen() auto noResize = window()->isFullScreen()
|| window()->isMaximized(); || window()->isMaximized();
auto savedValue = Auth().data().thirdSectionExtendedBy(); auto savedValue = Auth().settings().thirdSectionExtendedBy();
auto extendedBy = (savedValue == -1) auto extendedBy = (savedValue == -1)
? layout.thirdWidth ? layout.thirdWidth
: savedValue; : savedValue;
auto newBodyWidth = noResize auto newBodyWidth = noResize
? layout.bodyWidth ? layout.bodyWidth
: (layout.bodyWidth - extendedBy); : (layout.bodyWidth - extendedBy);
auto currentRatio = Auth().data().dialogsWidthRatio(); auto currentRatio = Auth().settings().dialogsWidthRatio();
Auth().data().setDialogsWidthRatio( Auth().settings().setDialogsWidthRatio(
(currentRatio * layout.bodyWidth) / newBodyWidth); (currentRatio * layout.bodyWidth) / newBodyWidth);
newWindowSize = QSize( newWindowSize = QSize(
window()->width() + (newBodyWidth - layout.bodyWidth), window()->width() + (newBodyWidth - layout.bodyWidth),
window()->height()); window()->height());
} }
Auth().data().setTabbedSelectorSectionEnabled(false); Auth().settings().setTabbedSelectorSectionEnabled(false);
Auth().data().setThirdSectionInfoEnabled(false); Auth().settings().setThirdSectionInfoEnabled(false);
Auth().saveDataDelayed(); Auth().saveSettingsDelayed();
if (window()->size() != newWindowSize) { if (window()->size() != newWindowSize) {
window()->resize(newWindowSize); window()->resize(newWindowSize);
} else { } else {
@ -358,9 +358,9 @@ void Navigation::showPeerInfo(
PeerId peerId, PeerId peerId,
const SectionShow &params) { const SectionShow &params) {
//if (Adaptive::ThreeColumn() //if (Adaptive::ThreeColumn()
// && !Auth().data().thirdSectionInfoEnabled()) { // && !Auth().settings().thirdSectionInfoEnabled()) {
// Auth().data().setThirdSectionInfoEnabled(true); // Auth().settings().setThirdSectionInfoEnabled(true);
// Auth().saveDataDelayed(); // Auth().saveSettingsDelayed();
//} //}
showSection(Info::Memento(peerId), params); showSection(Info::Memento(peerId), params);
} }

5
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "observer_peer.h" #include "observer_peer.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "window/window_controller.h" #include "window/window_controller.h"
#include "data/data_session.h"
namespace Window { namespace Window {
namespace { namespace {
@ -94,8 +95,8 @@ bool Filler::showInfo() {
} else if (!Adaptive::ThreeColumn()) { } else if (!Adaptive::ThreeColumn()) {
return true; return true;
} else if ( } else if (
!Auth().data().thirdSectionInfoEnabled() && !Auth().settings().thirdSectionInfoEnabled() &&
!Auth().data().tabbedReplacedWithInfo()) { !Auth().settings().tabbedReplacedWithInfo()) {
return true; return true;
} }
return false; return false;

2
Telegram/gyp/telegram_sources.txt
View File

@ -181,6 +181,8 @@
<(src_loc)/data/data_photo.h <(src_loc)/data/data_photo.h
<(src_loc)/data/data_search_controller.cpp <(src_loc)/data/data_search_controller.cpp
<(src_loc)/data/data_search_controller.h <(src_loc)/data/data_search_controller.h
<(src_loc)/data/data_session.cpp
<(src_loc)/data/data_session.h
<(src_loc)/data/data_shared_media.cpp <(src_loc)/data/data_shared_media.cpp
<(src_loc)/data/data_shared_media.h <(src_loc)/data/data_shared_media.h
<(src_loc)/data/data_sparse_ids.cpp <(src_loc)/data/data_sparse_ids.cpp