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

conversation model: only add messages in db for SIP accounts

Browse Source 
Change-Id: I1fd6655643f9cc734c33414421889b06f834d4da
This commit is contained in:
Adrien Béraud
2025-11-01 22:56:21 -04:00
parent 15d0a85127
commit 121a72571a
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libclient/conversationmodel.cpp
View File

@@ -3222,24 +3222,16 @@ ConversationModelPimpl::addIncomingMessage(const QString& peerId,
const uint64_t& timestamp,
const QString& daemonId)
{
if (linked.owner.profileInfo.type != profile::Type::SIP)
return "";
auto convIds = storage::getConversationsWithPeer(db, peerId);
bool isRequest = false;
if (convIds.empty()) {
// in case if we receive a message after removing contact, add a conversation request
try {
auto contact = linked.owner.contactModel->getContact(peerId);
isRequest = contact.profileInfo.type == profile::Type::PENDING;
// if isSip, it will be a contact!
auto isSip = linked.owner.profileInfo.type == profile::Type::SIP;
if (isSip || (isRequest && !contact.isBanned && peerId != linked.owner.profileInfo.uri)) {
if (!isSip)
addContactRequest(peerId);
convIds.push_back(storage::beginConversationWithPeer(db, contact.profileInfo.uri));
auto& conv = getConversationForPeerUri(contact.profileInfo.uri).get();
conv.uid = convIds[0];
} else {
return "";
}
convIds.push_back(storage::beginConversationWithPeer(db, contact.profileInfo.uri));
auto& conv = getConversationForPeerUri(contact.profileInfo.uri).get();
conv.uid = convIds[0];
} catch (const std::out_of_range&) {
return "";
}
@@ -3258,7 +3250,7 @@ ConversationModelPimpl::addIncomingMessage(const QString& peerId,
auto conversationIdx = indexOf(convIds[0]);
// Add the conversation if not already here
if (conversationIdx == -1) {
addConversationWith(convIds[0], peerId, isRequest);
addConversationWith(convIds[0], peerId, false);
Q_EMIT linked.newConversation(convIds[0]);
} else {
// Maybe check if this is failing?