anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix messages to self being duplicated

Browse source 
fixes #591
This commit is contained in:
fiaxh 2020-03-09 13:37:11 +01:00
parent efc085dc11
commit 4a08c8061d
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libdino/src/service/message_processor.vala
View file

@ -451,10 +451,18 @@ public class MessageProcessor : StreamInteractionModule, Object {
.with(db.message.stanza_id, "=", message.stanza_id) .with(db.message.stanza_id, "=", message.stanza_id)
.with(db.message.counterpart_id, "=", db.get_jid_id(message.counterpart)) .with(db.message.counterpart_id, "=", db.get_jid_id(message.counterpart))
.with(db.message.account_id, "=", account.id); .with(db.message.account_id, "=", account.id);
if (message.counterpart.resourcepart != null) { if (message.direction == Message.DIRECTION_RECEIVED) {
builder.with(db.message.counterpart_resource, "=", message.counterpart.resourcepart); if (message.counterpart.resourcepart != null) {
} else { builder.with(db.message.counterpart_resource, "=", message.counterpart.resourcepart);
builder.with_null(db.message.counterpart_resource); } else {
builder.with_null(db.message.counterpart_resource);
}
} else if (message.direction == Message.DIRECTION_SENT) {
if (message.ourpart.resourcepart != null) {
builder.with(db.message.our_resource, "=", message.ourpart.resourcepart);
} else {
builder.with_null(db.message.our_resource);
}
} }
RowOption row_opt = builder.single().row(); RowOption row_opt = builder.single().row();
bool duplicate = row_opt.is_present(); bool duplicate = row_opt.is_present();