Separate window for forums/topics/sublists/archive.

Telegram/SourceFiles/window/window_controller.cpp

@@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme_editor.h"
 #include "ui/boxes/confirm_box.h"
-#include "data/data_peer.h"
+#include "data/data_thread.h"
 #include "apiwrap.h" // ApiWrap::acceptTerms.
 #include "styles/style_layers.h"
 
@@ -93,23 +93,18 @@ Show::operator bool() const {
 
 } // namespace
 
-Controller::Controller() : Controller(CreateArgs{}) {
+Controller::Controller() : Controller(CreateArgs{ nullptr }) {
 }
 
-Controller::Controller(not_null<Main::Account*> account)
-: Controller(CreateArgs{}) {
-	showAccount(account);
-}
-
-Controller::Controller(
-	not_null<PeerData*> singlePeer,
-	MsgId showAtMsgId)
-: Controller(CreateArgs{ singlePeer.get() }) {
-	showAccount(&singlePeer->account(), showAtMsgId);
+Controller::Controller(SeparateId id, MsgId showAtMsgId)
+: Controller(CreateArgs{ id }) {
+	if (id) {
+		showAccount(id.account, showAtMsgId);
+	}
 }
 
 Controller::Controller(CreateArgs &&args)
-: _singlePeer(args.singlePeer)
+: _id(args.id)
 , _isActiveTimer([=] { updateIsActive(); })
 , _widget(this)
 , _adaptive(std::make_unique<Adaptive>()) {
@@ -125,6 +120,20 @@ Controller::~Controller() {
 	_sessionController = nullptr;
 }
 
+SeparateId Controller::id() const {
+	return _id;
+}
+
+bool Controller::isPrimary() const {
+	return _id.primary();
+}
+
+Main::Account &Controller::account() const {
+	Expects(_id.account != nullptr);
+
+	return *_id.account;
+}
+
 void Controller::showAccount(not_null<Main::Account*> account) {
 	showAccount(account, ShowAtUnreadMsgId);
 }
@@ -132,20 +141,22 @@ void Controller::showAccount(not_null<Main::Account*> account) {
 void Controller::showAccount(
 		not_null<Main::Account*> account,
 		MsgId singlePeerShowAtMsgId) {
-	Expects(isPrimary() || &_singlePeer->account() == account);
+	Expects(isPrimary() || _id.account == account);
 
-	const auto prevSessionUniqueId = (_account && _account->sessionExists())
-		? _account->session().uniqueId()
+	const auto prevAccount = _id.account;
+	const auto prevSession = maybeSession();
+	const auto prevSessionUniqueId = prevSession
+		? prevSession->uniqueId()
 		: 0;
 	_accountLifetime.destroy();
-	_account = account;
-	Core::App().checkWindowAccount(this);
+	_id.account = account;
+	Core::App().checkWindowId(this);
 
-	const auto updateOnlineOfPrevSesssion = crl::guard(_account, [=] {
+	const auto updateOnlineOfPrevSesssion = crl::guard(account, [=] {
 		if (!prevSessionUniqueId) {
 			return;
 		}
-		for (auto &[index, account] : _account->domain().accounts()) {
+		for (auto &[index, account] : _id.account->domain().accounts()) {
 			if (const auto anotherSession = account->maybeSession()) {
 				if (anotherSession->uniqueId() == prevSessionUniqueId) {
 					anotherSession->updates().updateOnline(crl::now());
@@ -155,12 +166,15 @@ void Controller::showAccount(
 		}
 	});
 
-	_account->sessionValue(
-	) | rpl::start_with_next([=](Main::Session *session) {
-		if (!isPrimary() && (&_singlePeer->session() != session)) {
+	if (!isPrimary()) {
+		_id.account->sessionChanges(
+		) | rpl::start_with_next([=](Main::Session *session) {
 			Core::App().closeWindow(this);
-			return;
-		}
+		}, _accountLifetime);
+	}
+
+	_id.account->sessionValue(
+	) | rpl::start_with_next([=](Main::Session *session) {
 		const auto was = base::take(_sessionController);
 		_sessionController = session
 			? std::make_unique<SessionController>(session, this)
@@ -205,10 +219,6 @@ void Controller::showAccount(
 	}, _accountLifetime);
 }
 
-PeerData *Controller::singlePeer() const {
-	return _singlePeer;
-}
-
 void Controller::setupSideBar() {
 	Expects(_sessionController != nullptr);
 
@@ -321,7 +331,7 @@ void Controller::finishFirstShow() {
 }
 
 Main::Session *Controller::maybeSession() const {
-	return _account ? _account->maybeSession() : nullptr;
+	return _id.account ? _id.account->maybeSession() : nullptr;
 }
 
 auto Controller::sessionControllerValue() const
@@ -356,7 +366,7 @@ void Controller::setupPasscodeLock() {
 }
 
 void Controller::clearPasscodeLock() {
-	if (!_account) {
+	if (!_id) {
 		showAccount(&Core::App().activeAccount());
 	} else {
 		_widget.clearPasscodeLock();
@@ -482,7 +492,7 @@ void Controller::invokeForSessionController(
 		PeerData *singlePeer,
 		Fn<void(not_null<SessionController*>)> &&callback) {
 	const auto separateWindow = singlePeer
-		? Core::App().separateWindowForPeer(singlePeer)
+		? Core::App().separateWindowFor(not_null(singlePeer))
 		: nullptr;
 	const auto separateSession = separateWindow
 		? separateWindow->sessionController()
@@ -490,7 +500,7 @@ void Controller::invokeForSessionController(
 	if (separateSession) {
 		return callback(separateSession);
 	}
-	_account->domain().activate(std::move(account));
+	_id.account->domain().activate(std::move(account));
 	if (_sessionController) {
 		callback(_sessionController.get());
 	}