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

Rename AuthSession to Main::Session.

This commit is contained in:
John Preston 2019-07-24 13:45:24 +02:00
parent 06982fdf04
commit ff44094ded
201 changed files with 543 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/api/api_sending.cpp
View File

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h" #include "history/history.h"
#include "history/history_message.h" // NewMessageFlags. #include "history/history_message.h" // NewMessageFlags.
#include "ui/text/text_entity.h" // TextWithEntities. #include "ui/text/text_entity.h" // TextWithEntities.
#include "auth_session.h" #include "main/main_session.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "apiwrap.h" #include "apiwrap.h"

6
Telegram/SourceFiles/apiwrap.cpp
View File

@ -35,7 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_item_components.h" #include "history/history_item_components.h"
//#include "history/feed/history_feed_section.h" // #feed //#include "history/feed/history_feed_section.h" // #feed
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "auth_session.h" #include "main/main_session.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/stickers_box.h" #include "boxes/stickers_box.h"
#include "boxes/sticker_set_box.h" #include "boxes/sticker_set_box.h"
@ -226,7 +226,7 @@ bool ApiWrap::BlockedUsersSlice::operator!=(const BlockedUsersSlice &other) cons
return !(*this == other); return !(*this == other);
} }
ApiWrap::ApiWrap(not_null<AuthSession*> session) ApiWrap::ApiWrap(not_null<Main::Session*> session)
: _session(session) : _session(session)
, _messageDataResolveDelayed([=] { resolveMessageDatas(); }) , _messageDataResolveDelayed([=] { resolveMessageDatas(); })
, _webPagesTimer([=] { resolveWebPages(); }) , _webPagesTimer([=] { resolveWebPages(); })
@ -249,7 +249,7 @@ ApiWrap::ApiWrap(not_null<AuthSession*> session)
}); });
} }
AuthSession &ApiWrap::session() const { Main::Session &ApiWrap::session() const {
return *_session; return *_session;
} }

11
Telegram/SourceFiles/apiwrap.h
View File

@ -16,13 +16,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_messages.h" #include "data/data_messages.h"
class TaskQueue; class TaskQueue;
class AuthSession;
struct MessageGroupId; struct MessageGroupId;
struct SendingAlbum; struct SendingAlbum;
enum class SendMediaType; enum class SendMediaType;
struct FileLoadTo; struct FileLoadTo;
class mtpFileLoader; class mtpFileLoader;
namespace Main {
class Session;
} // namespace Main
namespace Data { namespace Data {
struct UpdatedFileReferences; struct UpdatedFileReferences;
class WallPaper; class WallPaper;
@ -132,9 +135,9 @@ public:
bool operator!=(const BlockedUsersSlice &other) const; bool operator!=(const BlockedUsersSlice &other) const;
}; };
explicit ApiWrap(not_null<AuthSession*> session); explicit ApiWrap(not_null<Main::Session*> session);
AuthSession &session() const; Main::Session &session() const;
void applyUpdates( void applyUpdates(
const MTPUpdates &updates, const MTPUpdates &updates,
@ -710,7 +713,7 @@ private:
void sendDialogRequests(); void sendDialogRequests();
not_null<AuthSession*> _session; not_null<Main::Session*> _session;
base::flat_map<QString, int> _modifyRequests; base::flat_map<QString, int> _modifyRequests;

4
Telegram/SourceFiles/app.cpp
View File

@ -40,7 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "apiwrap.h" #include "apiwrap.h"
#include "numbers.h" #include "numbers.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_overview.h" #include "styles/style_overview.h"
#include "styles/style_mediaview.h" #include "styles/style_mediaview.h"
#include "styles/style_chat_helpers.h" #include "styles/style_chat_helpers.h"
@ -314,7 +314,7 @@ namespace App {
void quit() { void quit() {
if (quitting()) { if (quitting()) {
return; return;
} else if (AuthSession::Exists() } else if (Main::Session::Exists()
&& Auth().data().exportInProgress()) { && Auth().data().exportInProgress()) {
Auth().data().stopExportWithConfirmation([] { App::quit(); }); Auth().data().stopExportWithConfirmation([] { App::quit(); });
return; return;

16
Telegram/SourceFiles/boxes/add_contact_box.cpp
View File

@ -37,7 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h" #include "mainwindow.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "main/main_session.h"
namespace { namespace {
@ -156,7 +156,7 @@ class RevokePublicLinkBox::Inner : public TWidget, private MTP::Sender {
public: public:
Inner( Inner(
QWidget *parent, QWidget *parent,
not_null<AuthSession*> session, not_null<Main::Session*> session,
Fn<void()> revokeCallback); Fn<void()> revokeCallback);
protected: protected:
@ -176,7 +176,7 @@ private:
void paintChat(Painter &p, const ChatRow &row, bool selected) const; void paintChat(Painter &p, const ChatRow &row, bool selected) const;
void updateSelected(); void updateSelected();
const not_null<AuthSession*> _session; const not_null<Main::Session*> _session;
PeerData *_selected = nullptr; PeerData *_selected = nullptr;
PeerData *_pressed = nullptr; PeerData *_pressed = nullptr;
@ -195,13 +195,13 @@ private:
AddContactBox::AddContactBox( AddContactBox::AddContactBox(
QWidget*, QWidget*,
not_null<AuthSession*> session) not_null<Main::Session*> session)
: AddContactBox(nullptr, session, QString(), QString(), QString()) { : AddContactBox(nullptr, session, QString(), QString(), QString()) {
} }
AddContactBox::AddContactBox( AddContactBox::AddContactBox(
QWidget*, QWidget*,
not_null<AuthSession*> session, not_null<Main::Session*> session,
QString fname, QString fname,
QString lname, QString lname,
QString phone) QString phone)
@ -389,7 +389,7 @@ void AddContactBox::updateButtons() {
GroupInfoBox::GroupInfoBox( GroupInfoBox::GroupInfoBox(
QWidget*, QWidget*,
not_null<AuthSession*> session, not_null<Main::Session*> session,
Type type, Type type,
const QString &title, const QString &title,
Fn<void(not_null<ChannelData*>)> channelDone) Fn<void(not_null<ChannelData*>)> channelDone)
@ -1251,7 +1251,7 @@ bool EditNameBox::saveSelfFail(const RPCError &error) {
RevokePublicLinkBox::Inner::Inner( RevokePublicLinkBox::Inner::Inner(
QWidget *parent, QWidget *parent,
not_null<AuthSession*> session, not_null<Main::Session*> session,
Fn<void()> revokeCallback) Fn<void()> revokeCallback)
: TWidget(parent) : TWidget(parent)
, _session(session) , _session(session)
@ -1295,7 +1295,7 @@ RevokePublicLinkBox::Inner::Inner(
RevokePublicLinkBox::RevokePublicLinkBox( RevokePublicLinkBox::RevokePublicLinkBox(
QWidget*, QWidget*,
not_null<AuthSession*> session, not_null<Main::Session*> session,
Fn<void()> revokeCallback) Fn<void()> revokeCallback)
: _session(session) : _session(session)
, _aboutRevoke( , _aboutRevoke(

26
Telegram/SourceFiles/boxes/add_contact_box.h
View File

@ -13,11 +13,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
class ConfirmBox; class ConfirmBox;
class PeerListBox; class PeerListBox;
class AuthSession;
constexpr auto kMaxBioLength = 70; namespace Main {
class Session;
style::InputField CreateBioFieldStyle(); } // namespace Main
namespace Ui { namespace Ui {
class FlatLabel; class FlatLabel;
@ -33,11 +32,16 @@ class LinkButton;
class UserpicButton; class UserpicButton;
} // namespace Ui } // namespace Ui
constexpr auto kMaxBioLength = 70;
enum class PeerFloodType { enum class PeerFloodType {
Send, Send,
InviteGroup, InviteGroup,
InviteChannel, InviteChannel,
}; };
style::InputField CreateBioFieldStyle();
QString PeerFloodErrorText(PeerFloodType type); QString PeerFloodErrorText(PeerFloodType type);
void ShowAddParticipantsError( void ShowAddParticipantsError(
const QString &error, const QString &error,
@ -46,10 +50,10 @@ void ShowAddParticipantsError(
class AddContactBox : public BoxContent { class AddContactBox : public BoxContent {
public: public:
AddContactBox(QWidget*, not_null<AuthSession*> session); AddContactBox(QWidget*, not_null<Main::Session*> session);
AddContactBox( AddContactBox(
QWidget*, QWidget*,
not_null<AuthSession*> session, not_null<Main::Session*> session,
QString fname, QString fname,
QString lname, QString lname,
QString phone); QString phone);
@ -69,7 +73,7 @@ private:
void updateButtons(); void updateButtons();
void importDone(const MTPcontacts_ImportedContacts &result); void importDone(const MTPcontacts_ImportedContacts &result);
const not_null<AuthSession*> _session; const not_null<Main::Session*> _session;
object_ptr<Ui::InputField> _first; object_ptr<Ui::InputField> _first;
object_ptr<Ui::InputField> _last; object_ptr<Ui::InputField> _last;
@ -94,7 +98,7 @@ public:
}; };
GroupInfoBox( GroupInfoBox(
QWidget*, QWidget*,
not_null<AuthSession*> session, not_null<Main::Session*> session,
Type type, Type type,
const QString &title = QString(), const QString &title = QString(),
Fn<void(not_null<ChannelData*>)> channelDone = nullptr); Fn<void(not_null<ChannelData*>)> channelDone = nullptr);
@ -114,7 +118,7 @@ private:
void descriptionResized(); void descriptionResized();
void updateMaxHeight(); void updateMaxHeight();
const not_null<AuthSession*> _session; const not_null<Main::Session*> _session;
Type _type = Type::Group; Type _type = Type::Group;
QString _initialTitle; QString _initialTitle;
@ -227,7 +231,7 @@ class RevokePublicLinkBox : public BoxContent, public RPCSender {
public: public:
RevokePublicLinkBox( RevokePublicLinkBox(
QWidget*, QWidget*,
not_null<AuthSession*> session, not_null<Main::Session*> session,
Fn<void()> revokeCallback); Fn<void()> revokeCallback);
protected: protected:
@ -236,7 +240,7 @@ protected:
void resizeEvent(QResizeEvent *e) override; void resizeEvent(QResizeEvent *e) override;
private: private:
const not_null<AuthSession*> _session; const not_null<Main::Session*> _session;
object_ptr<Ui::FlatLabel> _aboutRevoke; object_ptr<Ui::FlatLabel> _aboutRevoke;

2
Telegram/SourceFiles/boxes/auto_download_box.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/auto_download_box.h" #include "boxes/auto_download_box.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "info/profile/info_profile_button.h" #include "info/profile/info_profile_button.h"
#include "ui/widgets/continuous_sliders.h" #include "ui/widgets/continuous_sliders.h"

2
Telegram/SourceFiles/boxes/background_box.cpp
View File

@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "ui/effects/round_checkbox.h" #include "ui/effects/round_checkbox.h"
#include "ui/image/image.h" #include "ui/image/image.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "mtproto/sender.h" #include "mtproto/sender.h"
#include "data/data_session.h" #include "data/data_session.h"

2
Telegram/SourceFiles/boxes/background_preview_box.cpp
View File

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h" #include "history/history.h"
#include "history/history_message.h" #include "history/history_message.h"
#include "history/view/history_view_message.h" #include "history/view/history_view_message.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_user.h" #include "data/data_user.h"

2
Telegram/SourceFiles/boxes/change_phone_box.cpp
View File

@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
#include "boxes/confirm_phone_box.h" #include "boxes/confirm_phone_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"

2
Telegram/SourceFiles/boxes/confirm_box.cpp
View File

@ -31,7 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_chat.h" #include "data/data_chat.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "auth_session.h" #include "main/main_session.h"
#include "observer_peer.h" #include "observer_peer.h"
TextParseOptions _confirmBoxTextOptions = { TextParseOptions _confirmBoxTextOptions = {

2
Telegram/SourceFiles/boxes/edit_caption_box.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/edit_caption_box.h" #include "boxes/edit_caption_box.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "chat_helpers/emoji_suggestions_widget.h" #include "chat_helpers/emoji_suggestions_widget.h"
#include "chat_helpers/message_field.h" #include "chat_helpers/message_field.h"
#include "chat_helpers/tabbed_panel.h" #include "chat_helpers/tabbed_panel.h"

2
Telegram/SourceFiles/boxes/edit_privacy_box.cpp
View File

@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/binary_guard.h" #include "base/binary_guard.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "data/data_chat.h" #include "data/data_chat.h"
#include "data/data_channel.h" #include "data/data_channel.h"

2
Telegram/SourceFiles/boxes/local_storage_box.cpp
View File

@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h" #include "data/data_session.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "auth_session.h" #include "main/main_session.h"
#include "layout.h" #include "layout.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"

2
Telegram/SourceFiles/boxes/mute_settings_box.cpp
View File

@ -8,7 +8,7 @@ Copyright (C) 2017, Nicholas Guriev <guriev-ns@ya.ru>
#include "boxes/mute_settings_box.h" #include "boxes/mute_settings_box.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "ui/special_buttons.h" #include "ui/special_buttons.h"

2
Telegram/SourceFiles/boxes/passcode_box.cpp
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/confirm_phone_box.h" #include "boxes/confirm_phone_box.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "auth_session.h" #include "main/main_session.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"

2
Telegram/SourceFiles/boxes/peer_list_box.cpp
View File

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_dialogs.h" #include "styles/style_dialogs.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include "auth_session.h" #include "main/main_session.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "ui/widgets/multi_select.h" #include "ui/widgets/multi_select.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"

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

@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_channel.h" #include "data/data_channel.h"
#include "data/data_chat.h" #include "data/data_chat.h"

2
Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
View File

@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h" #include "history/history.h"
#include "dialogs/dialogs_indexed_list.h" #include "dialogs/dialogs_indexed_list.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "auth_session.h" #include "main/main_session.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"

2
Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
View File

@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "window/window_controller.h" #include "window/window_controller.h"
#include "ui/toast/toast.h" #include "ui/toast/toast.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_info.h" #include "styles/style_info.h"

2
Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
View File

@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/add_contact_box.h" #include "boxes/add_contact_box.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_info.h" #include "styles/style_info.h"

2
Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
View File

@ -35,7 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/core_cloud_password.h" #include "core/core_cloud_password.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_info.h" #include "styles/style_info.h"

2
Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peers/add_participants_box.h" #include "boxes/peers/add_participants_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/add_contact_box.h" #include "boxes/add_contact_box.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwidget.h" #include "mainwidget.h"

2
Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peers/edit_peer_info_box.h" #include "boxes/peers/edit_peer_info_box.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "boxes/add_contact_box.h" #include "boxes/add_contact_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/peer_list_controllers.h" #include "boxes/peer_list_controllers.h"

2
Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peers/edit_peer_type_box.h" #include "boxes/peers/edit_peer_type_box.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "boxes/add_contact_box.h" #include "boxes/add_contact_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/peer_list_controllers.h" #include "boxes/peer_list_controllers.h"

2
Telegram/SourceFiles/boxes/rate_call_box.cpp
View File

@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
namespace { namespace {

2
Telegram/SourceFiles/boxes/self_destruction_box.cpp
View File

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
SelfDestructionBox::SelfDestructionBox( SelfDestructionBox::SelfDestructionBox(

2
Telegram/SourceFiles/boxes/sessions_box.cpp
View File

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"

5
Telegram/SourceFiles/boxes/share_box.cpp
View File

@ -33,12 +33,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_user.h" #include "data/data_user.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_folder.h" #include "data/data_folder.h"
#include "auth_session.h" #include "main/main_session.h"
#include "core/application.h" #include "core/application.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_history.h" #include "styles/style_history.h"
class ShareBox::Inner class ShareBox::Inner
: public Ui::RpWidget : public Ui::RpWidget
, public RPCSender , public RPCSender
@ -1106,7 +1105,7 @@ void ShareGameScoreByHash(const QString &hash) {
} }
auto hashDataInts = reinterpret_cast<int32*>(hashData.data()); auto hashDataInts = reinterpret_cast<int32*>(hashData.data());
if (!AuthSession::Exists() || hashDataInts[0] != Auth().userId()) { if (!Main::Session::Exists() || hashDataInts[0] != Auth().userId()) {
Ui::show(Box<InformBox>(tr::lng_share_wrong_user(tr::now))); Ui::show(Box<InformBox>(tr::lng_share_wrong_user(tr::now)));
return; return;
} }

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

@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lottie/lottie_animation.h" #include "lottie/lottie_animation.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "mainwindow.h" #include "mainwindow.h"

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

@ -31,7 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "ui/image/image.h" #include "ui/image/image.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_chat_helpers.h" #include "styles/style_chat_helpers.h"
@ -611,7 +611,7 @@ void StickersBox::saveChanges() {
if (_someArchivedLoaded) { if (_someArchivedLoaded) {
Local::writeArchivedStickers(); Local::writeArchivedStickers();
} }
if (AuthSession::Exists()) { if (Main::Session::Exists()) {
Auth().api().saveStickerSets(_installed.widget()->getOrder(), _installed.widget()->getRemovedSets()); Auth().api().saveStickerSets(_installed.widget()->getOrder(), _installed.widget()->getRemovedSets());
} }
} }

2
Telegram/SourceFiles/boxes/url_auth_box.cpp
View File

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"

2
Telegram/SourceFiles/boxes/username_box.cpp
View File

@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "ui/toast/toast.h" #include "ui/toast/toast.h"
#include "core/application.h" #include "core/application.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"

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

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h" #include "history/history.h"
#include "history/history_item.h" #include "history/history_item.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_media_types.h" #include "data/data_media_types.h"

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

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "calls/calls_call.h" #include "calls/calls_call.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"

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

@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/connection.h" #include "mtproto/connection.h"
#include "core/application.h" #include "core/application.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"

2
Telegram/SourceFiles/calls/calls_panel.cpp
View File

@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/application.h" #include "core/application.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "platform/platform_specific.h" #include "platform/platform_specific.h"

2
Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
View File

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_item_components.h" #include "history/history_item_components.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include "styles/style_history.h" #include "styles/style_history.h"

10
Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
View File

@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/platform_info.h" #include "platform/platform_info.h"
#include "ui/emoji_config.h" #include "ui/emoji_config.h"
#include "main/main_account.h" #include "main/main_account.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
namespace ChatHelpers { namespace ChatHelpers {
@ -468,7 +468,7 @@ int EmojiKeywords::LangPack::maxQueryLength() const {
EmojiKeywords::EmojiKeywords() { EmojiKeywords::EmojiKeywords() {
crl::on_main(&_guard, [=] { crl::on_main(&_guard, [=] {
handleAuthSessionChanges(); handleSessionChanges();
}); });
} }
@ -486,9 +486,9 @@ void EmojiKeywords::langPackRefreshed() {
_refreshed.fire({}); _refreshed.fire({});
} }
void EmojiKeywords::handleAuthSessionChanges() { void EmojiKeywords::handleSessionChanges() {
Core::App().activeAccount().sessionValue( Core::App().activeAccount().sessionValue(
) | rpl::map([](AuthSession *session) { ) | rpl::map([](Main::Session *session) {
return session ? &session->api() : nullptr; return session ? &session->api() : nullptr;
}) | rpl::start_with_next([=](ApiWrap *api) { }) | rpl::start_with_next([=](ApiWrap *api) {
apiChanged(api); apiChanged(api);
@ -528,7 +528,7 @@ void EmojiKeywords::refresh() {
} }
std::vector<QString> EmojiKeywords::languages() { std::vector<QString> EmojiKeywords::languages() {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return {}; return {};
} }
refreshInputLanguages(); refreshInputLanguages();

2
Telegram/SourceFiles/chat_helpers/emoji_keywords.h
View File

@ -52,7 +52,7 @@ private:
ApiWrap *api() override; ApiWrap *api() override;
void langPackRefreshed() override; void langPackRefreshed() override;
void handleAuthSessionChanges(); void handleSessionChanges();
void apiChanged(ApiWrap *api); void apiChanged(ApiWrap *api);
void refreshInputLanguages(); void refreshInputLanguages();
[[nodiscard]] std::vector<QString> languages(); [[nodiscard]] std::vector<QString> languages();

2
Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
View File

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
#include "core/application.h" #include "core/application.h"
#include "core/event_filter.h" #include "core/event_filter.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_chat_helpers.h" #include "styles/style_chat_helpers.h"
namespace Ui { namespace Ui {

2
Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
View File

@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lottie/lottie_single_player.h" #include "lottie/lottie_single_player.h"
#include "ui/widgets/scroll_area.h" #include "ui/widgets/scroll_area.h"
#include "ui/image/image.h" #include "ui/image/image.h"
#include "auth_session.h" #include "main/main_session.h"
#include "chat_helpers/stickers.h" #include "chat_helpers/stickers.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "styles/style_history.h" #include "styles/style_history.h"

2
Telegram/SourceFiles/chat_helpers/message_field.cpp
View File

@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_history.h" #include "styles/style_history.h"

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

@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "apiwrap.h" #include "apiwrap.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "ui/toast/toast.h" #include "ui/toast/toast.h"
#include "ui/emoji_config.h" #include "ui/emoji_config.h"
@ -1115,7 +1115,7 @@ auto LottieCachedFromContent(
Method &&method, Method &&method,
Storage::Cache::Key baseKey, Storage::Cache::Key baseKey,
LottieSize sizeTag, LottieSize sizeTag,
not_null<AuthSession*> session, not_null<Main::Session*> session,
const QByteArray &content, const QByteArray &content,
QSize box) { QSize box) {
const auto key = Storage::Cache::Key{ const auto key = Storage::Cache::Key{

5
Telegram/SourceFiles/chat_helpers/stickers.h
View File

@ -11,7 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/image/image_source.h" #include "ui/image/image_source.h"
class DocumentData; class DocumentData;
class AuthSession;
namespace Main {
class Session;
} // namespace Main
namespace Storage { namespace Storage {
namespace Cache { namespace Cache {

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

@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/stickers_box.h" #include "boxes/stickers_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "window/window_session_controller.h" // GifPauseReason. #include "window/window_session_controller.h" // GifPauseReason.
#include "auth_session.h" #include "main/main_session.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "styles/style_chat_helpers.h" #include "styles/style_chat_helpers.h"
@ -850,7 +850,7 @@ StickersListWidget::StickersListWidget(
})); }));
} }
AuthSession &StickersListWidget::session() const { Main::Session &StickersListWidget::session() const {
return controller()->session(); return controller()->session();
} }

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

@ -12,7 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/variant.h" #include "base/variant.h"
#include "base/timer.h" #include "base/timer.h"
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace Window { namespace Window {
class SessionController; class SessionController;
@ -42,7 +44,7 @@ public:
QWidget *parent, QWidget *parent,
not_null<Window::SessionController*> controller); not_null<Window::SessionController*> controller);
AuthSession &session() const; Main::Session &session() const;
rpl::producer<not_null<DocumentData*>> chosen() const; rpl::producer<not_null<DocumentData*>> chosen() const;
rpl::producer<> scrollUpdated() const; rpl::producer<> scrollUpdated() const;

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

@ -372,7 +372,7 @@ TabbedSelector::TabbedSelector(
TabbedSelector::~TabbedSelector() = default; TabbedSelector::~TabbedSelector() = default;
AuthSession &TabbedSelector::session() const { Main::Session &TabbedSelector::session() const {
return _controller->session(); return _controller->session();
} }

4
Telegram/SourceFiles/chat_helpers/tabbed_selector.h
View File

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/effects/animations.h" #include "ui/effects/animations.h"
#include "ui/effects/panel_animation.h" #include "ui/effects/panel_animation.h"
#include "mtproto/sender.h" #include "mtproto/sender.h"
#include "auth_session.h" #include "main/main_session.h"
namespace InlineBots { namespace InlineBots {
class Result; class Result;
@ -57,7 +57,7 @@ public:
Mode mode = Mode::Full); Mode mode = Mode::Full);
~TabbedSelector(); ~TabbedSelector();
AuthSession &session() const; Main::Session &session() const;
rpl::producer<EmojiPtr> emojiChosen() const; rpl::producer<EmojiPtr> emojiChosen() const;
rpl::producer<not_null<DocumentData*>> fileChosen() const; rpl::producer<not_null<DocumentData*>> fileChosen() const;

6
Telegram/SourceFiles/core/application.cpp
View File

@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h" #include "mainwindow.h"
#include "dialogs/dialogs_entry.h" #include "dialogs/dialogs_entry.h"
#include "history/history.h" #include "history/history.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "calls/calls_instance.h" #include "calls/calls_instance.h"
#include "lang/lang_file_parser.h" #include "lang/lang_file_parser.h"
@ -116,8 +116,8 @@ Application::~Application() {
_window.reset(); _window.reset();
_mediaView.reset(); _mediaView.reset();
// This can call writeMap() that serializes AuthSession. // This can call writeMap() that serializes Main::Session.
// In case it gets called after authSessionDestroy() we get missing data. // In case it gets called after destroySession() we get missing data.
Local::finish(); Local::finish();
// Some MTP requests can be cancelled from data clearing. // Some MTP requests can be cancelled from data clearing.

3
Telegram/SourceFiles/core/application.h
View File

@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/auth_key.h" #include "mtproto/auth_key.h"
#include "base/timer.h" #include "base/timer.h"
class AuthSessionSettings;
class MainWindow; class MainWindow;
class MainWidget; class MainWidget;
class FileUploader; class FileUploader;
@ -140,7 +139,7 @@ public:
return *_account; return *_account;
} }
// AuthSession component. // Main::Session component.
int unreadBadge() const; int unreadBadge() const;
bool unreadBadgeMuted() const; bool unreadBadgeMuted() const;

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

@ -71,7 +71,7 @@ QString FormatVersionPrecise(int version) {
} // namespace } // namespace
Changelogs::Changelogs(not_null<AuthSession*> session, int oldVersion) Changelogs::Changelogs(not_null<Main::Session*> session, int oldVersion)
: _session(session) : _session(session)
, _oldVersion(oldVersion) { , _oldVersion(oldVersion) {
_session->data().chatsListChanges( _session->data().chatsListChanges(
@ -83,7 +83,7 @@ Changelogs::Changelogs(not_null<AuthSession*> session, int oldVersion)
} }
std::unique_ptr<Changelogs> Changelogs::Create( std::unique_ptr<Changelogs> Changelogs::Create(
not_null<AuthSession*> session) { not_null<Main::Session*> session) {
const auto oldVersion = Local::oldMapVersion(); const auto oldVersion = Local::oldMapVersion();
return (oldVersion > 0 && oldVersion < AppVersion) return (oldVersion > 0 && oldVersion < AppVersion)
? std::make_unique<Changelogs>(session, oldVersion) ? std::make_unique<Changelogs>(session, oldVersion)

10
Telegram/SourceFiles/core/changelogs.h
View File

@ -9,16 +9,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/weak_ptr.h" #include "base/weak_ptr.h"
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace Core { namespace Core {
class Changelogs : public base::has_weak_ptr, private base::Subscriber { class Changelogs : public base::has_weak_ptr, private base::Subscriber {
public: public:
Changelogs(not_null<AuthSession*> session, int oldVersion); Changelogs(not_null<Main::Session*> session, int oldVersion);
static std::unique_ptr<Changelogs> Create( static std::unique_ptr<Changelogs> Create(
not_null<AuthSession*> session); not_null<Main::Session*> session);
private: private:
void requestCloudLogs(); void requestCloudLogs();
@ -27,7 +29,7 @@ private:
void addBetaLogs(); void addBetaLogs();
void addBetaLog(int changeVersion, const char *changes); void addBetaLog(int changeVersion, const char *changes);
const not_null<AuthSession*> _session; const not_null<Main::Session*> _session;
const int _oldVersion = 0; const int _oldVersion = 0;
rpl::lifetime _chatsSubscription; rpl::lifetime _chatsSubscription;
bool _addedSomeLocal = false; bool _addedSomeLocal = false;

2
Telegram/SourceFiles/core/click_handler_types.cpp
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/local_url_handlers.h" #include "core/local_url_handlers.h"
#include "core/file_utilities.h" #include "core/file_utilities.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
#include "history/view/history_view_element.h" #include "history/view/history_view_element.h"
#include "history/history_item.h" #include "history/history_item.h"

2
Telegram/SourceFiles/core/file_utilities.cpp
View File

@ -148,7 +148,7 @@ QString DefaultDownloadPath() {
return QStandardPaths::writableLocation( return QStandardPaths::writableLocation(
QStandardPaths::DownloadLocation) QStandardPaths::DownloadLocation)
+ '/' + '/'
+ (AuthSession::Exists() && Auth().supportMode() + (Main::Session::Exists() && Auth().supportMode()
? "Tsupport Desktop" ? "Tsupport Desktop"
: str_const_toString(AppName)) : str_const_toString(AppName))
+ '/'; + '/';

20
Telegram/SourceFiles/core/local_url_handlers.cpp
View File

@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_channel.h" #include "data/data_channel.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
namespace Core { namespace Core {
@ -34,7 +34,7 @@ namespace {
using Match = qthelp::RegularExpressionMatch; using Match = qthelp::RegularExpressionMatch;
bool JoinGroupByHash(const Match &match, const QVariant &context) { bool JoinGroupByHash(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
const auto hash = match->captured(1); const auto hash = match->captured(1);
@ -62,7 +62,7 @@ bool JoinGroupByHash(const Match &match, const QVariant &context) {
} }
bool ShowStickerSet(const Match &match, const QVariant &context) { bool ShowStickerSet(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
Core::App().hideMediaView(); Core::App().hideMediaView();
@ -79,7 +79,7 @@ bool SetLanguage(const Match &match, const QVariant &context) {
} }
bool ShareUrl(const Match &match, const QVariant &context) { bool ShareUrl(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
auto params = url_parse_params( auto params = url_parse_params(
@ -94,7 +94,7 @@ bool ShareUrl(const Match &match, const QVariant &context) {
} }
bool ConfirmPhone(const Match &match, const QVariant &context) { bool ConfirmPhone(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
auto params = url_parse_params( auto params = url_parse_params(
@ -110,7 +110,7 @@ bool ConfirmPhone(const Match &match, const QVariant &context) {
} }
bool ShareGameScore(const Match &match, const QVariant &context) { bool ShareGameScore(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
const auto params = url_parse_params( const auto params = url_parse_params(
@ -167,7 +167,7 @@ bool ShowPassport(const Match &match, const QVariant &context) {
} }
bool ShowWallPaper(const Match &match, const QVariant &context) { bool ShowWallPaper(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
const auto params = url_parse_params( const auto params = url_parse_params(
@ -179,7 +179,7 @@ bool ShowWallPaper(const Match &match, const QVariant &context) {
} }
bool ResolveUsername(const Match &match, const QVariant &context) { bool ResolveUsername(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
const auto params = url_parse_params( const auto params = url_parse_params(
@ -229,7 +229,7 @@ bool ResolveUsername(const Match &match, const QVariant &context) {
} }
bool ResolvePrivatePost(const Match &match, const QVariant &context) { bool ResolvePrivatePost(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
const auto params = url_parse_params( const auto params = url_parse_params(
@ -274,7 +274,7 @@ bool ResolvePrivatePost(const Match &match, const QVariant &context) {
} }
bool HandleUnknown(const Match &match, const QVariant &context) { bool HandleUnknown(const Match &match, const QVariant &context) {
if (!AuthSession::Exists()) { if (!Main::Session::Exists()) {
return false; return false;
} }
const auto request = match->captured(1); const auto request = match->captured(1);

2
Telegram/SourceFiles/data/data_channel.cpp
View File

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/unixtime.h" #include "base/unixtime.h"
#include "history/history.h" #include "history/history.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
namespace { namespace {

2
Telegram/SourceFiles/data/data_channel_admins.cpp
View File

@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history.h" #include "history/history.h"
#include "data/data_channel.h" #include "data/data_channel.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "auth_session.h" #include "main/main_session.h"
namespace Data { namespace Data {

2
Telegram/SourceFiles/data/data_chat.cpp
View File

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_channel.h" #include "data/data_channel.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "history/history.h" #include "history/history.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "observer_peer.h" #include "observer_peer.h"

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

@ -453,7 +453,7 @@ Data::Session &DocumentData::owner() const {
return *_owner; return *_owner;
} }
AuthSession &DocumentData::session() const { Main::Session &DocumentData::session() const {
return _owner->session(); return _owner->session();
} }

9
Telegram/SourceFiles/data/data_document.h
View File

@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_types.h" #include "data/data_types.h"
#include "ui/image/image.h" #include "ui/image/image.h"
class mtpFileLoader;
namespace Images { namespace Images {
class Source; class Source;
} // namespace Images } // namespace Images
@ -31,8 +33,9 @@ namespace Data {
class Session; class Session;
} // namespace Data } // namespace Data
class AuthSession; namespace Main {
class mtpFileLoader; class Session;
} // namespace Main
inline uint64 mediaMix32To64(int32 a, int32 b) { inline uint64 mediaMix32To64(int32 a, int32 b) {
return (uint64(*reinterpret_cast<uint32*>(&a)) << 32) return (uint64(*reinterpret_cast<uint32*>(&a)) << 32)
@ -84,7 +87,7 @@ public:
DocumentData(not_null<Data::Session*> owner, DocumentId id); DocumentData(not_null<Data::Session*> owner, DocumentId id);
[[nodiscard]] Data::Session &owner() const; [[nodiscard]] Data::Session &owner() const;
[[nodiscard]] AuthSession &session() const; [[nodiscard]] Main::Session &session() const;
void setattributes( void setattributes(
const QVector<MTPDocumentAttribute> &attributes); const QVector<MTPDocumentAttribute> &attributes);

2
Telegram/SourceFiles/data/data_document_good_thumbnail.cpp
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
#include "media/clip/media_clip_reader.h" #include "media/clip/media_clip_reader.h"
#include "lottie/lottie_animation.h" #include "lottie/lottie_animation.h"
#include "auth_session.h" #include "main/main_session.h"
namespace Data { namespace Data {
namespace { namespace {

4
Telegram/SourceFiles/data/data_folder.cpp
View File

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/application.h" #include "core/application.h"
#include "main/main_account.h" #include "main/main_account.h"
//#include "storage/storage_feed_messages.h" // #feed //#include "storage/storage_feed_messages.h" // #feed
#include "auth_session.h" #include "main/main_session.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "mainwidget.h" #include "mainwidget.h"
@ -30,7 +30,7 @@ constexpr auto kLoadedChatsMinCount = 20;
constexpr auto kShowChatNamesCount = 8; constexpr auto kShowChatNamesCount = 8;
rpl::producer<int> PinnedDialogsInFolderMaxValue( rpl::producer<int> PinnedDialogsInFolderMaxValue(
not_null<AuthSession*> session) { not_null<Main::Session*> session) {
return rpl::single( return rpl::single(
rpl::empty_value() rpl::empty_value()
) | rpl::then( ) | rpl::then(

5
Telegram/SourceFiles/data/data_folder.h
View File

@ -12,7 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_messages.h" #include "data/data_messages.h"
class ChannelData; class ChannelData;
class AuthSession;
namespace Main {
class Session;
} // namespace Main
namespace Data { namespace Data {

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

@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "observer_peer.h" #include "observer_peer.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "auth_session.h" #include "main/main_session.h"
#include "core/application.h" #include "core/application.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
@ -108,7 +108,7 @@ Data::Session &PeerData::owner() const {
return *_owner; return *_owner;
} }
AuthSession &PeerData::session() const { Main::Session &PeerData::session() const {
return _owner->session(); return _owner->session();
} }

12
Telegram/SourceFiles/data/data_peer.h
View File

@ -11,18 +11,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_flags.h" #include "data/data_flags.h"
#include "data/data_notify_settings.h" #include "data/data_notify_settings.h"
namespace Ui {
class EmptyUserpic;
} // namespace Ui
class AuthSession;
class PeerData; class PeerData;
class UserData; class UserData;
class ChatData; class ChatData;
class ChannelData; class ChannelData;
namespace Ui {
class EmptyUserpic;
} // namespace Ui
namespace Main { namespace Main {
class Account; class Account;
class Session;
} // namespace Main } // namespace Main
namespace Data { namespace Data {
@ -125,7 +125,7 @@ public:
static constexpr auto kServiceNotificationsId = peerFromUser(777000); static constexpr auto kServiceNotificationsId = peerFromUser(777000);
[[nodiscard]] Data::Session &owner() const; [[nodiscard]] Data::Session &owner() const;
[[nodiscard]] AuthSession &session() const; [[nodiscard]] Main::Session &session() const;
[[nodiscard]] Main::Account &account() const; [[nodiscard]] Main::Account &account() const;
[[nodiscard]] bool isUser() const { [[nodiscard]] bool isUser() const {

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

@ -23,7 +23,7 @@ Data::Session &PhotoData::owner() const {
return *_owner; return *_owner;
} }
AuthSession &PhotoData::session() const { Main::Session &PhotoData::session() const {
return _owner->session(); return _owner->session();
} }

6
Telegram/SourceFiles/data/data_photo.h
View File

@ -9,7 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_types.h" #include "data/data_types.h"
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace Data { namespace Data {
class Session; class Session;
@ -20,7 +22,7 @@ public:
PhotoData(not_null<Data::Session*> owner, PhotoId id); PhotoData(not_null<Data::Session*> owner, PhotoId id);
[[nodiscard]] Data::Session &owner() const; [[nodiscard]] Data::Session &owner() const;
[[nodiscard]] AuthSession &session() const; [[nodiscard]] Main::Session &session() const;
void automaticLoad( void automaticLoad(
Data::FileOrigin origin, Data::FileOrigin origin,

2
Telegram/SourceFiles/data/data_poll.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_poll.h" #include "data/data_poll.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
namespace { namespace {

2
Telegram/SourceFiles/data/data_pts_waiter.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_pts_waiter.h" #include "data/data_pts_waiter.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
uint64 PtsWaiter::ptsKey(PtsSkippedQueue queue, int32 pts) { uint64 PtsWaiter::ptsKey(PtsSkippedQueue queue, int32 pts) {

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

@ -7,7 +7,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 "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_messages.h" #include "data/data_messages.h"
#include "data/data_channel.h" #include "data/data_channel.h"

6
Telegram/SourceFiles/data/data_session.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h" #include "data/data_session.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "core/application.h" #include "core/application.h"
@ -157,7 +157,7 @@ MTPPhotoSize FindDocumentThumbnail(const MTPDdocument &data) {
} }
rpl::producer<int> PinnedDialogsCountMaxValue( rpl::producer<int> PinnedDialogsCountMaxValue(
not_null<AuthSession*> session) { not_null<Main::Session*> session) {
return rpl::single( return rpl::single(
rpl::empty_value() rpl::empty_value()
) | rpl::then( ) | rpl::then(
@ -189,7 +189,7 @@ bool PruneDestroyedAndSet(
} // namespace } // namespace
Session::Session(not_null<AuthSession*> session) Session::Session(not_null<Main::Session*> session)
: _session(session) : _session(session)
, _cache(Core::App().databases().get( , _cache(Core::App().databases().get(
Local::cachePath(), Local::cachePath(),

10
Telegram/SourceFiles/data/data_session.h
View File

@ -33,7 +33,9 @@ class Element;
class ElementDelegate; class ElementDelegate;
} // namespace HistoryView } // namespace HistoryView
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace Media { namespace Media {
namespace Clip { namespace Clip {
@ -70,10 +72,10 @@ public:
QString text; QString text;
}; };
explicit Session(not_null<AuthSession*> session); explicit Session(not_null<Main::Session*> session);
~Session(); ~Session();
[[nodiscard]] AuthSession &session() const { [[nodiscard]] Main::Session &session() const {
return *_session; return *_session;
} }
@ -811,7 +813,7 @@ private:
void setWallpapers(const QVector<MTPWallPaper> &data, int32 hash); void setWallpapers(const QVector<MTPWallPaper> &data, int32 hash);
not_null<AuthSession*> _session; not_null<Main::Session*> _session;
Storage::DatabasePointer _cache; Storage::DatabasePointer _cache;
Storage::DatabasePointer _bigFileCache; Storage::DatabasePointer _bigFileCache;

2
Telegram/SourceFiles/data/data_shared_media.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_shared_media.h" #include "data/data_shared_media.h"
#include <rpl/combine.h> #include <rpl/combine.h>
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "storage/storage_facade.h" #include "storage/storage_facade.h"
#include "storage/storage_shared_media.h" #include "storage/storage_shared_media.h"

2
Telegram/SourceFiles/data/data_types.cpp
View File

@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/input_fields.h" #include "ui/widgets/input_fields.h"
#include "storage/cache/storage_cache_types.h" #include "storage/cache/storage_cache_types.h"
#include "base/openssl_help.h" #include "base/openssl_help.h"
#include "auth_session.h" #include "main/main_session.h"
namespace Data { namespace Data {
namespace { namespace {

2
Telegram/SourceFiles/data/data_user_photos.cpp
View File

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "data/data_user_photos.h" #include "data/data_user_photos.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "storage/storage_facade.h" #include "storage/storage_facade.h"

2
Telegram/SourceFiles/data/data_wall_paper.cpp
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h" #include "data/data_session.h"
#include "storage/serialize_common.h" #include "storage/serialize_common.h"
#include "core/application.h" #include "core/application.h"
#include "auth_session.h" #include "main/main_session.h"
namespace Data { namespace Data {
namespace { namespace {

2
Telegram/SourceFiles/data/data_web_page.cpp
View File

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "data/data_web_page.h" #include "data/data_web_page.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "data/data_session.h" #include "data/data_session.h"

4
Telegram/SourceFiles/dialogs/dialogs_entry.cpp
View File

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_folder.h" #include "data/data_folder.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "history/history_item.h" #include "history/history_item.h"
#include "history/history.h" #include "history/history.h"
#include "styles/style_dialogs.h" // st::dialogsTextWidthMin #include "styles/style_dialogs.h" // st::dialogsTextWidthMin
@ -49,7 +49,7 @@ Data::Session &Entry::owner() const {
return *_owner; return *_owner;
} }
AuthSession &Entry::session() const { Main::Session &Entry::session() const {
return _owner->session(); return _owner->session();
} }

6
Telegram/SourceFiles/dialogs/dialogs_entry.h
View File

@ -11,7 +11,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "dialogs/dialogs_key.h" #include "dialogs/dialogs_key.h"
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace Data { namespace Data {
class Session; class Session;
@ -93,7 +95,7 @@ public:
virtual ~Entry() = default; virtual ~Entry() = default;
Data::Session &owner() const; Data::Session &owner() const;
AuthSession &session() const; Main::Session &session() const;
PositionChange adjustByPosInChatList(Mode list); PositionChange adjustByPosInChatList(Mode list);
bool inChatList(Mode list = Mode::All) const { bool inChatList(Mode list = Mode::All) const {

2
Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
View File

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "dialogs/dialogs_indexed_list.h" #include "dialogs/dialogs_indexed_list.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "history/history.h" #include "history/history.h"

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

@ -34,7 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "chat_helpers/stickers.h" #include "chat_helpers/stickers.h"
#include "auth_session.h" #include "main/main_session.h"
#include "window/notifications_manager.h" #include "window/notifications_manager.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "window/window_peer_menu.h" #include "window/window_peer_menu.h"
@ -250,7 +250,7 @@ InnerWidget::InnerWidget(
setupShortcuts(); setupShortcuts();
} }
AuthSession &InnerWidget::session() const { Main::Session &InnerWidget::session() const {
return _controller->session(); return _controller->session();
} }

6
Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
View File

@ -13,7 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/rp_widget.h" #include "ui/rp_widget.h"
#include "base/flags.h" #include "base/flags.h"
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace Ui { namespace Ui {
class IconButton; class IconButton;
@ -163,7 +165,7 @@ private:
NextOrOriginal, NextOrOriginal,
}; };
AuthSession &session() const; Main::Session &session() const;
void dialogRowReplaced(Row *oldRow, Row *newRow); void dialogRowReplaced(Row *oldRow, Row *newRow);

2
Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
View File

@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_chat.h" #include "data/data_chat.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
namespace Dialogs { namespace Dialogs {

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

@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "core/application.h" #include "core/application.h"
#include "core/event_filter.h" #include "core/event_filter.h"

4
Telegram/SourceFiles/dialogs/dialogs_widget.h
View File

@ -13,7 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "dialogs/dialogs_key.h" #include "dialogs/dialogs_key.h"
#include "ui/special_buttons.h" #include "ui/special_buttons.h"
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace HistoryView { namespace HistoryView {
class TopBarWidget; class TopBarWidget;

2
Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
View File

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "core/file_utilities.h" #include "core/file_utilities.h"
#include "platform/platform_info.h" #include "platform/platform_info.h"
#include "auth_session.h" #include "main/main_session.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "styles/style_export.h" #include "styles/style_export.h"

2
Telegram/SourceFiles/export/view/export_view_settings.cpp
View File

@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/file_utilities.h" #include "core/file_utilities.h"
#include "boxes/calendar_box.h" #include "boxes/calendar_box.h"
#include "base/unixtime.h" #include "base/unixtime.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include "styles/style_export.h" #include "styles/style_export.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"

2
Telegram/SourceFiles/facades.cpp
View File

@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h" #include "mainwindow.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "auth_session.h" #include "main/main_session.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/url_auth_box.h" #include "boxes/url_auth_box.h"
#include "window/layer_widget.h" #include "window/layer_widget.h"

4
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View File

@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "apiwrap.h" #include "apiwrap.h"
#include "layout.h" #include "layout.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"
#include "auth_session.h" #include "main/main_session.h"
#include "ui/widgets/popup_menu.h" #include "ui/widgets/popup_menu.h"
#include "ui/image/image.h" #include "ui/image/image.h"
#include "ui/text/text_utilities.h" #include "ui/text/text_utilities.h"
@ -277,7 +277,7 @@ InnerWidget::InnerWidget(
requestAdmins(); requestAdmins();
} }
AuthSession &InnerWidget::session() const { Main::Session &InnerWidget::session() const {
return _controller->session(); return _controller->session();
} }

6
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
View File

@ -16,7 +16,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/sender.h" #include "mtproto/sender.h"
#include "base/timer.h" #include "base/timer.h"
class AuthSession; namespace Main {
class Session;
} // namespace Main
namespace HistoryView { namespace HistoryView {
class Element; class Element;
@ -50,7 +52,7 @@ public:
not_null<Window::SessionController*> controller, not_null<Window::SessionController*> controller,
not_null<ChannelData*> channel); not_null<ChannelData*> channel);
AuthSession &session() const; Main::Session &session() const;
base::Observable<void> showSearchSignal; base::Observable<void> showSearchSignal;
base::Observable<int> scrollToSignal; base::Observable<int> scrollToSignal;

2
Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
View File

@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/unixtime.h" #include "base/unixtime.h"
#include "core/application.h" #include "core/application.h"
#include "mainwindow.h" // App::wnd()->sessionController #include "mainwindow.h" // App::wnd()->sessionController
#include "auth_session.h" #include "main/main_session.h"
namespace AdminLog { namespace AdminLog {
namespace { namespace {

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

@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwidget.h" #include "mainwidget.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "main/main_session.h"
#include "window/notifications_manager.h" #include "window/notifications_manager.h"
#include "calls/calls_instance.h" #include "calls/calls_instance.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"

5
Telegram/SourceFiles/history/history.h
View File

@ -23,7 +23,10 @@ class HistoryItem;
class HistoryMessage; class HistoryMessage;
class HistoryService; class HistoryService;
class HistoryMedia; class HistoryMedia;
class AuthSession;
namespace Main {
class Session;
} // namespace Main
namespace Data { namespace Data {
struct Draft; struct Draft;

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

@ -38,7 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h" #include "mainwindow.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "layout.h" #include "layout.h"
#include "auth_session.h" #include "main/main_session.h"
#include "core/application.h" #include "core/application.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "platform/platform_info.h" #include "platform/platform_info.h"
@ -185,7 +185,7 @@ HistoryInner::HistoryInner(
}, lifetime()); }, lifetime());
} }
AuthSession &HistoryInner::session() const { Main::Session &HistoryInner::session() const {
return _controller->session(); return _controller->session();
} }

2
Telegram/SourceFiles/history/history_inner_widget.h
View File

@ -52,7 +52,7 @@ public:
Ui::ScrollArea *scroll, Ui::ScrollArea *scroll,
not_null<History*> history); not_null<History*> history);
AuthSession &session() const; Main::Session &session() const;
void messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages); void messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages);
void messagesReceivedDown(PeerData *peer, const QVector<MTPMessage> &messages); void messagesReceivedDown(PeerData *peer, const QVector<MTPMessage> &messages);

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

@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/storage_facade.h" #include "storage/storage_facade.h"
#include "storage/storage_shared_media.h" #include "storage/storage_shared_media.h"
//#include "storage/storage_feed_messages.h" // #feed //#include "storage/storage_feed_messages.h" // #feed
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "media/audio/media_audio.h" #include "media/audio/media_audio.h"
#include "core/application.h" #include "core/application.h"

2
Telegram/SourceFiles/history/history_item_components.cpp
View File

@ -23,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_user.h" #include "data/data_user.h"
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
#include "auth_session.h" #include "main/main_session.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include "styles/style_history.h" #include "styles/style_history.h"
#include "window/window_session_controller.h" #include "window/window_session_controller.h"

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

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/history_service.h" #include "history/history_service.h"
#include "history/view/history_view_service_message.h" #include "history/view/history_view_service_message.h"
#include "history/view/history_view_context_menu.h" // For CopyPostLink(). #include "history/view/history_view_context_menu.h" // For CopyPostLink().
#include "auth_session.h" #include "main/main_session.h"
#include "boxes/share_box.h" #include "boxes/share_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "ui/toast/toast.h" #include "ui/toast/toast.h"

2
Telegram/SourceFiles/history/history_service.cpp
View File

@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "auth_session.h" #include "main/main_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "layout.h" #include "layout.h"
#include "history/history.h" #include "history/history.h"

Some files were not shown because too many files have changed in this diff Show More