From c3a9d1988260e4eeec27af3bc3055aa2d6ce1d39 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Mar 2023 16:08:50 +1100 Subject: [PATCH] chore: cleanup the lastMessage update logic --- ts/models/conversation.ts | 41 ++++++++++++++++------------- ts/models/conversationAttributes.ts | 5 ++-- ts/types/Conversation.ts | 26 ------------------ 3 files changed, 25 insertions(+), 47 deletions(-) delete mode 100644 ts/types/Conversation.ts diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 7f5cf5061..6a8aa4c99 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -79,7 +79,6 @@ import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libses import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups'; import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils'; import { getOurProfile } from '../session/utils/User'; -import { createLastMessageUpdate } from '../types/Conversation'; import { deleteExternalFilesOfConversation, getAbsoluteAttachmentPath, @@ -1847,7 +1846,7 @@ export class ConversationModel extends Backbone.Model { } private async bouncyUpdateLastMessage() { - if (!this.id || !this.get('active_at')) { + if (!this.id || !this.get('active_at') || this.isHidden()) { return; } const messages = await Data.getLastMessagesByConversation(this.id, 1, true); @@ -1856,34 +1855,38 @@ export class ConversationModel extends Backbone.Model { return; } const lastMessageModel = messages.at(0); - const lastMessageStatusModel = lastMessageModel - ? lastMessageModel.getMessagePropStatus() - : undefined; - const lastMessageUpdate = createLastMessageUpdate({ - lastMessageStatus: lastMessageStatusModel, - lastMessageNotificationText: lastMessageModel - ? lastMessageModel.getNotificationText() - : undefined, - }); + const lastMessageStatus = lastMessageModel?.getMessagePropStatus() || undefined; + const lastMessageNotificationText = lastMessageModel?.getNotificationText() || undefined; + // we just want to set the `status` to `undefined` if there are no `lastMessageNotificationText` + const lastMessageUpdate = + !!lastMessageNotificationText && !isEmpty(lastMessageNotificationText) + ? { + lastMessage: lastMessageNotificationText || '', + lastMessageStatus, + } + : { lastMessage: '', lastMessageStatus: undefined }; + const existingLastMessageAttribute = this.get('lastMessage'); + const existingLastMessageStatus = this.get('lastMessageStatus'); if ( - lastMessageUpdate.lastMessage !== this.get('lastMessage') || - lastMessageUpdate.lastMessageStatus !== this.get('lastMessageStatus') + lastMessageUpdate.lastMessage !== existingLastMessageAttribute || + lastMessageUpdate.lastMessageStatus !== existingLastMessageStatus ) { - const lastMessageAttribute = this.get('lastMessage'); if ( - lastMessageUpdate.lastMessageStatus === this.get('lastMessageStatus') && + lastMessageUpdate.lastMessageStatus === existingLastMessageStatus && lastMessageUpdate.lastMessage && lastMessageUpdate.lastMessage.length > 40 && - lastMessageAttribute && - lastMessageAttribute.length > 40 && - lastMessageUpdate.lastMessage.startsWith(lastMessageAttribute) + existingLastMessageAttribute && + existingLastMessageAttribute.length > 40 && + lastMessageUpdate.lastMessage.startsWith(existingLastMessageAttribute) ) { // if status is the same, and text has a long length which starts with the db status, do not trigger an update. // we only store the first 60 chars in the db for the lastMessage attributes (see sql.ts) return; } - this.set(lastMessageUpdate); + this.set({ + ...lastMessageUpdate, + }); await this.commit(); } } diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts index 8aaf49814..451d026b5 100644 --- a/ts/models/conversationAttributes.ts +++ b/ts/models/conversationAttributes.ts @@ -71,7 +71,7 @@ export interface ConversationAttributes { avatarInProfile?: string; // this is the avatar path locally once downloaded and stored in the application attachments folder - isTrustedForAttachmentDownload: boolean; + isTrustedForAttachmentDownload: boolean; // not synced accross devices, this field is used if we should auto download attachments from this conversation or not conversationIdOrigin?: string; // Blinded message requests ONLY: The community from which this conversation originated from @@ -82,7 +82,8 @@ export interface ConversationAttributes { // =========================================================================== // All of the items below are duplicated one way or the other with libsession. // It would be nice to at some point be able to only rely on libsession dumps - // for those so there is no need to keep them in sync, but just have them in the dumps + // for those so there is no need to keep them in sync, but just have them in the dumps. + // Note: If we do remove them, we also need to add some logic to the wrappers. For instance, we can currently search by nickname or display name and that works through the DB. displayNameInProfile?: string; // no matter the type of conversation, this is the real name as set by the user/name of the open or closed group nickname?: string; // this is the name WE gave to that user (only applicable to private chats, not closed group neither opengroups) diff --git a/ts/types/Conversation.ts b/ts/types/Conversation.ts deleted file mode 100644 index 0a60af6fa..000000000 --- a/ts/types/Conversation.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { LastMessageStatusType } from '../state/ducks/conversations'; - -interface ConversationLastMessageUpdate { - lastMessage: string; - lastMessageStatus: LastMessageStatusType; -} - -export const createLastMessageUpdate = ({ - lastMessageStatus, - lastMessageNotificationText, -}: { - lastMessageStatus?: LastMessageStatusType; - lastMessageNotificationText?: string; -}): ConversationLastMessageUpdate => { - if (!lastMessageNotificationText) { - return { - lastMessage: '', - lastMessageStatus: undefined, - }; - } - - return { - lastMessage: lastMessageNotificationText || '', - lastMessageStatus: lastMessageStatus || undefined, - }; -};