Add target account name to notifications.

Telegram/SourceFiles/core/application.cpp

@@ -99,11 +99,11 @@ Application::Application(not_null<Launcher*> launcher)
 , _fallbackProductionConfig(
 	std::make_unique<MTP::Config>(MTP::Environment::Production))
 , _domain(std::make_unique<Main::Domain>(cDataFile()))
-, _notifications(std::make_unique<Window::Notifications::System>())
 , _langpack(std::make_unique<Lang::Instance>())
 , _langCloudManager(std::make_unique<Lang::CloudManager>(langpack()))
 , _emojiKeywords(std::make_unique<ChatHelpers::EmojiKeywords>())
 , _audio(std::make_unique<Media::Audio::Instance>())
+, _notifications(std::make_unique<Window::Notifications::System>())
 , _logo(Window::LoadLogo())
 , _logoNoMargin(Window::LoadLogoNoMargin())
 , _autoLockTimer([=] { checkAutoLock(); }) {

Telegram/SourceFiles/platform/mac/notifications_manager_mac.h

@@ -31,6 +31,7 @@ protected:
 	void doClearAllFast() override;
 	void doClearFromHistory(not_null<History*> history) override;
 	void doClearFromSession(not_null<Main::Session*> session) override;
+	QString accountNameSeparator() override;
 
 private:
 	class Private;

Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm

@@ -386,5 +386,9 @@ void Manager::doClearFromSession(not_null<Main::Session*> session) {
 	_private->clearFromSession(session);
 }
 
+QString Manager::accountNameSeparator() {
+	return QString::fromUtf8(" \xE2\x86\x92 ");
+}
+
 } // namespace Notifications
 } // namespace Platform

Telegram/SourceFiles/window/notifications_manager.cpp

@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
+#include "data/data_user.h"
 #include "base/unixtime.h"
 #include "window/window_session_controller.h"
 #include "core/application.h"
@@ -547,6 +548,18 @@ Manager::DisplayOptions Manager::GetNotificationOptions(HistoryItem *item) {
 	return result;
 }
 
+QString Manager::addTargetAccountName(
+		const QString &title,
+		not_null<Main::Session*> session) {
+	return (Core::App().domain().accounts().size() > 1)
+		? (title + accountNameSeparator() + session->user()->name)
+		: title;
+}
+
+QString Manager::accountNameSeparator() {
+	return QString::fromUtf8(" \xE2\x9E\x9C ");
+}
+
 void Manager::notificationActivated(NotificationId id) {
 	onBeforeNotificationActivated(id);
 	if (const auto session = system()->findSession(id.selfId)) {
@@ -644,6 +657,7 @@ void NativeManager::doShowNotification(
 		: (scheduled && peer->isSelf())
 		? tr::lng_notification_reminder(tr::now)
 		: peer->name;
+	const auto fullTitle = addTargetAccountName(title, &peer->session());
 	const auto subtitle = options.hideNameAndPhoto
 		? QString()
 		: item->notificationHeader();
@@ -661,7 +675,7 @@ void NativeManager::doShowNotification(
 		item->history()->peer,
 		userpicView,
 		item->id,
-		scheduled ? WrapFromScheduled(title) : title,
+		scheduled ? WrapFromScheduled(fullTitle) : fullTitle,
 		subtitle,
 		text,
 		options.hideNameAndPhoto,

Telegram/SourceFiles/window/notifications_manager.h

@@ -186,6 +186,10 @@ public:
 	[[nodiscard]] static DisplayOptions GetNotificationOptions(
 		HistoryItem *item);
 
+	[[nodiscard]] QString addTargetAccountName(
+		const QString &title,
+		not_null<Main::Session*> session);
+
 	virtual ~Manager() = default;
 
 protected:
@@ -206,6 +210,7 @@ protected:
 	}
 	virtual void onAfterNotificationActivated(NotificationId id) {
 	}
+	[[nodiscard]] virtual QString accountNameSeparator();
 
 private:
 	void openNotificationMessage(

Telegram/SourceFiles/window/notifications_manager_default.cpp

@@ -812,16 +812,17 @@ void Notification::updateNotifyDisplay() {
 		}
 
 		p.setPen(st::dialogsNameFg);
-		if (options.hideNameAndPhoto) {
+		Ui::Text::String titleText;
-			p.setFont(st::msgNameFont);
+		const auto title = options.hideNameAndPhoto
-			static QString notifyTitle = st::msgNameFont->elided(qsl("Telegram Desktop"), rectForName.width());
+			? qsl("Telegram Desktop")
-			p.drawText(rectForName.left(), rectForName.top() + st::msgNameFont->ascent, notifyTitle);
+			: reminder
-		} else if (reminder) {
+			? tr::lng_notification_reminder(tr::now)
-			p.setFont(st::msgNameFont);
+			: _history->peer->nameText().toString();
-			p.drawText(rectForName.left(), rectForName.top() + st::msgNameFont->ascent, tr::lng_notification_reminder(tr::now));
+		const auto fullTitle = manager()->addTargetAccountName(
-		} else {
+			title,
-			_history->peer->nameText().drawElided(p, rectForName.left(), rectForName.top(), rectForName.width());
+			&_history->session());
-		}
+		titleText.setText(st::msgNameStyle, fullTitle, Ui::NameTextOptions());
+		titleText.drawElided(p, rectForName.left(), rectForName.top(), rectForName.width());
 	}
 
 	_cache = App::pixmapFromImageInPlace(std::move(img));

Telegram/SourceFiles/window/notifications_manager_default.h

@@ -152,7 +152,7 @@ protected:
 	virtual void updateGeometry(int x, int y, int width, int height);
 
 protected:
-	not_null<Manager*> manager() const {
+	[[nodiscard]] not_null<Manager*> manager() const {
 		return _manager;
 	}