Mirror/jami-client-qt
1
0
Fork 0
mirror of https://github.com/savoirfairelinux/jami-client-qt.git synced 2025-12-18 08:35:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

notifications: no longer blank notifications when leaving or joining a group

Browse Source 
Fixed the issue of blank notification when leaving a group by updating the
OnNewUnreadNotification function.

GitLab: #1921

Change-Id: I87f4c3828a72c9b504a9a68707d6b257ce00154c
This commit is contained in:
pmagnier-slimani
2025-02-20 15:30:21 -05:00
parent 217efe603b
commit 6b0adb7005
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/conversationsadapter.cpp
View File

@@ -171,10 +171,20 @@ ConversationsAdapter::onNewUnreadInteraction(const QString& accountId,
if (interaction.authorUri == accountInfo.profileInfo.uri)
return;
auto from = accountInfo.contactModel->bestNameForContact(interaction.authorUri);
auto body_ = interaction.body;
QString displayedString;
if (interaction.type == interaction::Type::DATA_TRANSFER) {
body_ = interaction.commit.value("displayName");
// Add special handling for member events
if (interaction.type == interaction::Type::CONTACT) {
auto action = interaction.commit.value("action");
if (action == "join") {
displayedString = tr("%1 has joined the conversation.").arg(from);
} else if (action == "remove") {
displayedString = tr("%1 has left the conversation.").arg(from);
}
} else if (interaction.type == interaction::Type::DATA_TRANSFER) {
displayedString = from + ": " + interaction.commit.value("displayName");
} else {
displayedString = from + ": " + interaction.body;
}
auto preferences = accountInfo.conversationModel->getConversationPreferences(convUid);
@@ -190,7 +200,7 @@ ConversationsAdapter::onNewUnreadInteraction(const QString& accountId,
auto notifId = QString("%1;%2;%3").arg(accountId, convUid, interactionId);
systemTray_->showNotification(notifId,
tr("%1 received a new message").arg(to),
from + ": " + body_,
displayedString,
SystemTray::NotificationType::CHAT,
Utils::QImageToByteArray(contactPhoto));