Merge pull request #2439 from Bilb/fix-unread-having-json-attributes

fix: getUnread() messages should have the json as object rather than str
pull/2448/head
Audric Ackermann 3 years ago committed by GitHub
commit 6a15cfaf82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -479,10 +479,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
);
}
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<ConversationAttributes> {
: null;
}
private async getUnread() {
return Data.getUnreadByConversation(this.id);
}
/**
*
* @returns The open group conversationId this conversation originated from

@ -1094,7 +1094,7 @@ function getUnreadByConversation(conversationId: string) {
conversationId,
});
return rows;
return map(rows, row => jsonToObject(row.json));
}
function getUnreadCountByConversation(conversationId: string) {

Loading…
Cancel
Save