mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Show topic title in the notifications.

Browse Source
This commit is contained in:
John Preston
2022-11-01 20:57:36 +04:00
parent 969b051c8f
commit e62bdd286d
6 changed files with 100 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -942,8 +942,8 @@ TextWithEntities Manager::ComposeReactionNotification(
return text();
}
QString Manager::addTargetAccountName(
const QString &title,
TextWithEntities Manager::addTargetAccountName(
TextWithEntities title,
not_null<Main::Session*> session) {
const auto add = [&] {
for (const auto &[index, account] : Core::App().domain().accounts()) {
@@ -955,13 +955,19 @@ QString Manager::addTargetAccountName(
}
return false;
}();
return add
? (title
+ accountNameSeparator()
+ (session->user()->username().isEmpty()
? session->user()->name()
: session->user()->username()))
: title;
if (!add) {
return title;
}
return title.append(accountNameSeparator()).append(
(session->user()->username().isEmpty()
? session->user()->name()
: session->user()->username()));
}
QString Manager::addTargetAccountName(
const QString &title,
not_null<Main::Session*> session) {
return addTargetAccountName(TextWithEntities{ title }, session).text;
}
QString Manager::accountNameSeparator() {
@@ -1099,11 +1105,16 @@ void NativeManager::doShowNotification(NotificationFields &&fields) {
&& !reactionFrom
&& (item->out() || peer->isSelf())
&& item->isFromScheduled();
const auto topicWithChat = [&] {
const auto name = peer->name();
const auto topic = item->topic();
return topic ? (topic->title() + u" ("_q + name + ')') : name;
};
const auto title = options.hideNameAndPhoto
? AppName.utf16()
: (scheduled && peer->isSelf())
? tr::lng_notification_reminder(tr::now)
: peer->name();
: topicWithChat();
const auto fullTitle = addTargetAccountName(title, &peer->session());
const auto subtitle = reactionFrom
? (reactionFrom != peer ? reactionFrom->name() : QString())