diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index bc14d2ccf..b080af0e4 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -479,10 +479,6 @@ export class ConversationModel extends Backbone.Model { ); } - public async getUnread() { - return Data.getUnreadByConversation(this.id); - } - public async getUnreadCount() { const unreadCount = await Data.getUnreadCountByConversation(this.id); @@ -1908,6 +1904,10 @@ export class ConversationModel extends Backbone.Model { : null; } + private async getUnread() { + return Data.getUnreadByConversation(this.id); + } + /** * * @returns The open group conversationId this conversation originated from diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 9d4ad82ad..1d55f72b5 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1094,7 +1094,7 @@ function getUnreadByConversation(conversationId: string) { conversationId, }); - return rows; + return map(rows, row => jsonToObject(row.json)); } function getUnreadCountByConversation(conversationId: string) {