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

Fix unread counting in new conversations w/o read_up_to_item

Browse source 
fixes #1094
This commit is contained in:
fiaxh 2021-12-21 18:51:57 +01:00
parent 4e9957deaf
commit 1378224444
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libdino/src/service/chat_interaction.vala
View file

@ -33,17 +33,21 @@ public class ChatInteraction : StreamInteractionModule, Object {
} }
public int get_num_unread(Conversation conversation) { public int get_num_unread(Conversation conversation) {
ContentItem? read_up_to_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_item_by_id(conversation, conversation.read_up_to_item);
if (read_up_to_item == null) return 0;
Database db = Dino.Application.get_default().db; Database db = Dino.Application.get_default().db;
string time = read_up_to_item.time.to_unix().to_string();
string id = read_up_to_item.id.to_string(); Qlite.QueryBuilder query = db.content_item.select()
return (int)db.content_item.select()
.where(@"time > ? OR (time = ? AND id > ?)", { time, time, id })
.with(db.content_item.conversation_id, "=", conversation.id) .with(db.content_item.conversation_id, "=", conversation.id)
.with(db.content_item.hide, "=", false) .with(db.content_item.hide, "=", false);
.count();
ContentItem? read_up_to_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_item_by_id(conversation, conversation.read_up_to_item);
if (read_up_to_item != null) {
string time = read_up_to_item.time.to_unix().to_string();
string id = read_up_to_item.id.to_string();
query.where(@"time > ? OR (time = ? AND id > ?)", { time, time, id });
}
// If it's a new conversation with read_up_to_item == null, all items are new.
return (int) query.count();
} }
public bool is_active_focus(Conversation? conversation = null) { public bool is_active_focus(Conversation? conversation = null) {